subversion proper renaming and merging as if you’ve read the whole code of conduct
DESCRIPTION
TRANSCRIPT
![Page 1: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/1.jpg)
Subversion proper renaming and merging as if you’ve read the whole code of conduct
Fazreil Amreen bin Abdul Jalil
![Page 2: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/2.jpg)
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.
![Page 3: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/3.jpg)
Original file and folders at the repo
Checked out to D:\SVN_checkouts\sandbox\branchedout
![Page 4: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/4.jpg)
Checked out folder
Branched out to
![Page 5: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/5.jpg)
Branch out from TRUNK
![Page 6: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/6.jpg)
Branch out from TRUNK
![Page 7: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/7.jpg)
Switch to the refactoring_branch
![Page 8: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/8.jpg)
Switch to the refactoring_branch
![Page 9: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/9.jpg)
Switch to the refactoring_branch
![Page 10: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/10.jpg)
Renaming cordon bleu using tortoise svn
![Page 11: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/11.jpg)
Renaming cordon bleu using tortoise svn
![Page 12: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/12.jpg)
Result of renaming
Notice the icon is (addition)
![Page 13: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/13.jpg)
Renaming index by F2 or rightclick rename
![Page 14: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/14.jpg)
Result of naming
Notice the icon is (non-version item)
![Page 15: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/15.jpg)
Svn commit both changes
![Page 16: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/16.jpg)
Svn commit both changes
![Page 17: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/17.jpg)
After commit, switch back to trunk
![Page 18: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/18.jpg)
After commit, switch back to trunk
![Page 19: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/19.jpg)
Now in trunk
Notice the filename is the original from trunk
![Page 20: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/20.jpg)
Merge changes from refactoring_branch
![Page 21: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/21.jpg)
Merge changes from refactoring_branch
![Page 22: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/22.jpg)
Merge changes from refactoring_branch
![Page 23: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/23.jpg)
After merge, commit for trunk
![Page 24: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/24.jpg)
After merge, commit for trunk
![Page 25: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/25.jpg)
After merge, commit for trunk
![Page 26: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/26.jpg)
Log of Cordon Bleu
![Page 27: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/27.jpg)
Log of Cordon Bleu
Notice the log is legacy, it inherit the log entry of the files before
rename
![Page 28: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/28.jpg)
Revision graph of Cordon Bleu
![Page 29: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/29.jpg)
Log of index
![Page 30: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/30.jpg)
Log of index
Notice the file is treated as new
![Page 31: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/31.jpg)
Revision graph of index and index renamed
Index.html Index renamed.html
![Page 32: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/32.jpg)
Revision graph of index and index renamed
Index.html Index renamed.html
Lost continuation
![Page 33: Subversion proper renaming and merging as if you’ve read the whole code of conduct](https://reader038.vdocument.in/reader038/viewer/2022103014/54784400b4af9f37228b45a8/html5/thumbnails/33.jpg)
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.