I wanted to port some bug fixes from the trunk to a branch. These were in 2 different revisions so I was going to do 2 merge operations. The first merge worked fine, but there was a discrepancy in the log display for the 2nd merge. Here are the steps:
1. Right-clicked WC for the branch and selected TortoiseSVN/Merge...
2. Selected 1st option (Merge a range of revisions) and clicked Next
3. The "URL to merge from" showed the branch folder so I used the "..." button to select the trunk folder.
4. Used the "Show Log" button to select the revision to merge.
5. Clicked Next then Merge to complete the merge. All changes were merged fine.
6. To do more merging I again right-clicked WC for the branch and selected TortoiseSVN/Merge...
7. Selected 1st option (Merge a range of revisions) and clicked Next
8. The "URL to merge from" now showed the previously used trunk folder so I did not need to chnage that.
9. BUG?: When I clicked the "Show Log" button it showed the log for the branch not the log for the trunk
10. I clicked the "..." and re-selected the trunk folder then tried the "Show Log" button again and it was no OK.
11. I selected the revisions to merge and completed the merge as above. All changes were merged fine.
Obviously this is not a major problem. Thought someone should know though.
TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06
Subversion 1.6.9,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2444167
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-02 15:23:22 CET