[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Best way to reintegrate on 1.4 server

From: Jeff <jsbmsu_at_gmail.com>
Date: Fri, 11 Jul 2008 07:07:06 -0700 (PDT)

So, acceptable/advisable approaches would be.........

(Figure numbers refer to TortoiseSVN 1.5 Manual, and only to indicate
which dialog, not the entered info depicted in those figures)

Short-lived feature branch:
- Create branch, resulting in Rev A
- Make changes/commits to branch without merging in any trunk changes
ever. Final change results in Rev. B.
- Switch WC to trunk
- Use "Merge revision range" dialog (Fig. 5.35) to merge FROM
<URL_of_branch> with Revision range: A-B
- Commit WC to trunk.

Long-lived feature branch:
- Create branch, resulting in Rev. A
- Make changes/commits to branch
- Keep synchronized with trunk using "Merge revision range" dialog
(Fig. 5.35). How about a loop:
--- 1. X = A
--- 2. Merge FROM <URL_of_trunk> with Revision range: X-HEAD
--- 3. Commit WC to branch. Y = resulting revision
--- 4. Continue making changes/commits to branch, until ready to pull
more trunk changes
--- 5. X = Y (That is, Rev. of last sync with trunk)
--- Repeat steps 2-5 until ready to merge branch back into trunk
- Now, branch changes are done, and all trunk changes were *very*
recently merged into the branch, resulting in Rev. Z (=Y_final)
- Switch WC to trunk
- Use "Tree merge" dialog (Fig. 5.37) to merge FROM trunk_at_Z TO
branch_at_Z
- Run Update on WC to get any possible last-minute changes from trunk
since Rev. Z
- Commit WC to trunk

...........with the former being acceptable but more likely to result
in conflicts during the final merge?

And of course, this doesn't even cover the task of continuing work on
a branch after it's been merged back into the trunk (assuming the
branch isn't simply discarded at that point). I guess the merge into
trunk would result in revision N, and so after more branch changes,
start at Step #1 above, but change that step to X = N.

Thanks for your help. I'm guessing every new user struggles just a
little with this?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-11 16:13:01 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.