1. Subversion proper
renaming and
merging as if you’ve
read the whole code
of conduct
Fazreil Amreen bin Abdul Jalil

2. This is a demo
• What happen when we rename the files using
the svn client and
• What happen when we don’t use the svn
client
• There are 2 files:
– Cordon Bleu.txt (will rename using svn client)
– Index.html (will rename not using svn client)
• Svn client used is tortoise svn.

3. Original file and folders at the repo
Checked out to
D:SVN_checkoutssandboxbranchedout

4. Checked out folder
Branched out to

5. Branch out from TRUNK

6. Branch out from TRUNK

7. Switch to the refactoring_branch

8. Switch to the refactoring_branch

9. Switch to the refactoring_branch

10. Renaming cordon bleu using tortoise
svn

11. Renaming cordon bleu using tortoise
svn

12. Result of renaming
Notice the icon is (addition)

13. Renaming index by F2 or rightclick
rename

14. Result of naming
Notice the icon is (non-version
item)

15. Svn commit both changes

16. Svn commit both changes

17. After commit, switch back to trunk

18. After commit, switch back to trunk

19. Now in trunk
Notice the filename is the original
from trunk

20. Merge changes from
refactoring_branch

21. Merge changes from
refactoring_branch

22. Merge changes from
refactoring_branch

23. After merge, commit for trunk

24. After merge, commit for trunk

25. After merge, commit for trunk

26. Log of Cordon Bleu

27. Log of Cordon Bleu
Notice the log is legacy, it inherit
the log entry of the files before
rename

28. Revision graph of Cordon Bleu

29. Log of index

30. Log of index
Notice the file is treated as new

31. Revision graph of index and index
renamed
Index.html Index renamed.html

32. Revision graph of index and index
renamed
Index.html Index renamed.html

33. conclusion
• Improper renaming method will cause the
version losing its track.
• Renaming is done by copying the file using
command line svn copy
• Which automatically makes the file to be marked
with addition while maintaining the history
• Same thing apply to delete, please delete using
tortoise svn>delete, if not the item will be
marked as missing.