Subversion proper renaming and merging as if you’ve read the whole code of conduct

Fazreil Amreen bin Abdul Jalil

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.

Original file and folders at the repo

Checked out to D:\SVN_checkouts\sandbox\branchedout

Checked out folder

Branched out to

Branch out from TRUNK

Branch out from TRUNK

Switch to the refactoring_branch

Switch to the refactoring_branch

Switch to the refactoring_branch

Renaming cordon bleu using tortoise svn

Renaming cordon bleu using tortoise svn

Result of renaming

Notice the icon is (addition)

Renaming index by F2 or rightclick rename

Result of naming

Notice the icon is (non-version item)

Svn commit both changes

Svn commit both changes

After commit, switch back to trunk

After commit, switch back to trunk

Now in trunk

Notice the filename is the original from trunk

Merge changes from refactoring_branch

Merge changes from refactoring_branch

Merge changes from refactoring_branch

After merge, commit for trunk

After merge, commit for trunk

After merge, commit for trunk

Log of Cordon Bleu

Log of Cordon Bleu

Notice the log is legacy, it inherit the log entry of the files before

rename

Revision graph of Cordon Bleu

Log of index

Log of index

Notice the file is treated as new

Revision graph of index and index renamed

Index.html Index renamed.html

Revision graph of index and index renamed

Index.html Index renamed.html

Lost continuation

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.