Selecting 'all revisions' when merging branch with rename commit, omits changes before the rename.

10 views
Skip to first unread message

Tom Arnautovic

unread,
Aug 24, 2020, 12:15:38 PM8/24/20
to TortoiseSVN
I created a branch A from trunk in r1.  Added a new directory to branch A in r2.  Renamed the branch in r3 effectively creating branch B.  Did a number of other commits after that to branch B.  I then attempted to merge branch B into trunk, selecting 'All revisions' but this through up some problems because the SVN did not recognise the directory I had created.  It seems the 'all revisions' did not include any commits prior to the renaming of the branch. If I manually selected the revisions from the log and included the revision where the branch was renamed, it worked okay.
Reply all
Reply to author
Forward
0 new messages