Bob, thank you for your patience. You've been quite helpful. I seem to be up and running with the new SVN 1.8.2 merging procedures.
I'm going to document _everything_ here in the hope it helps others.
> See my previous email to the list. In 1.8.x there is no "reintegrate" selection. I'm not sure what docs you are reading.
Looks like we posted at just about the same time :|
BTW, the doc I'm referring to can be found at: http://downloads.sourceforge.net/tortoisesvn/TortoiseSVN-1.8.2-en.pdf
From your post at http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064087
> What version of TSVN are you using?
I just upgraded to TSVN 1.8.2
> In 1.8.x:
>
> Here you right click on the working copy and select "Merge a range of revisions" and svn will figure out
> if this is a reintegrate automatically. Then you would select your source (URL to merge from). Also, you
> can continue to use a branch in this case, since svn somehow figures out if you do a re-integrate again
> the right thing to do, you don't have to do the merge only record. I'm not sure how or what it does behind
> the scenes, but there you are.
OK, I'll follow these steps and record them here. I'll supply _all_ the information. (I know, information overload :( )
HISTORY:
1. Branch bugfix12345 was created while I was still using TSVN 1.7.9
a. Opened Repository Browser
b. Copied /trunk to /private/Marshall/bugfix12345
The revision graph shows this as /trunk (r595) --> /private/Marshall/bugfix12345 (r597)
2. Well, obviously I worked on bugfix12345 for a while because...
3. Synchronized branch with trunk
a. From the bugfix12345 working copy, "merge trunk into branch" (r667)
4. Fixed a few conflicts and commited the changes.
REINTEGRATION:
1. Upgraded to TSVN 1.8.2
2. Tried to commit any changes on the trunk (nothing to commit)
3. Updated trunk (no real changes seen, output follows...)
Command Update
Updating O:\<projectName>
Completed At revision 667
4. Right click on the trunk working copy and select "Merge a range of revisions"
5. Merge revision range dialog box
URL to merge from: https://<redacted>/svn/<projectName>/private/Marshall/bugfix12345
Revision range to merge:
(*) specific range <blank> (this was the default. I didn't change it going on your statement of "svn will figure out ...")
[ ] Reverse merge
Working Copy: O:\<projectName> (trunk)
4. Merge options dialog box
I left all the default values...
Merge depth: Working copy
[ ] Ignore ancestry
[ ] ignore line endings
(*) Compare whitespaces
[ ] Force the merge
[ ] Only record the merge
[ ] Do reintegrate instead of automatic merge
5. Test merge
Command: Merging revisions 1-HEAD of https://<redacted>/svn/<projectName>/private/Marshall/bugfix12345 into O:\<projectName>, respecting ancestry, Test Only
Merging r597 through r667
There were a lot of tree conflicts and a few file conflicts. I didn't expect this, especially since I've already synced the branch with the trunk (see above)
6. Merge
No conflicts were seen.
7. Undo Add... on directory O:\<projectName>\research
I added the /research directory in the bugfix12345 branch. This was my own personal notes during branch development and shouldn't be
merged back into the trunk.
8. SVN Commit...
Message: Reintegrated /private/Marshall/bugfix12345 branch with the trunk.
Commit Finished! dialog
Completed at r668
Note: I pressed the OK button to close. NOT the Merge button.
The svn:mergeinfo now has following added to it: /private/Marshall/bugfix12345:597-667
KEEPING BRANCH ALIVE
I used to do this when working with TSVN 1.6 and 1.7 by using the "Merge a range of revisions" with the "Only record the merge" option.
However, I'm not going to do that here since you recommended that...
> Also, you can continue to use a branch in this case, since svn somehow figures out if you do a re-integrate again
> the right thing to do, you don't have to do the merge only record. I'm not sure how or what it does behind
> the scenes, but there you are.
BTW, this merging using the "Only record the merge" option works by adding information to the svn:mergeinfo property of the branch's directory. I can see this by
going to the repository browser, and selecting the properties of /private/Marshall/bugfix12345
Sure enough "/trunk:597-666" was added to svn:mergeinfo
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064108
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-06 21:36:01 CEST