Menu
Does TortoiseSVN Revision Graph draw a line from Branch back to the Trunk when I finish a "Merge"?
434
Merging ranges of revisionsEdit To merge a range of revisions, use svn merge -r start:end from to where start and end are revision IDs. This will merge all revisions starting at start+1 up to and INCLUDING end . Note: it will NOT include the first revision (ex: -r3:45 will merge 4 through 45).
Taking a branch is a copy operation (which is very cheap in svn) and it looks obvious in the logs that is what happened, hence the line. It's obvious (to svn/tortioiseSVN) because you can't make a branch without taking every single artefact from the trunk at the revision you chose. That's why a line is always shown - making a branch is guaranteed to take all your files from the trunk into your branch. Merging back in is different, you can selectively merge in whatever you want.
Merging back in is not a copy but a commit of your diffs from the HEAD (current latest trunk) to your own working copy (your branch). To SVN, it looks like someone took the latest trunk and changed a load of files at once and committed them in.
IMO, a line going back to trunk would be misleading because you could merge and choose the trunks version over your own for every single file - the line would imply you had brought all your changes in but there is actually no guarantee you brought any in.
72
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
