RE: Reintegration a branch (not always seen as reintegrated)

Yes, we use the same pattern.

You were already doing what you need. Merge from the branch into the
trunk. Merge tracking will keep track of what has been merged in on the
trunk.

You do this just by right clicking on the trunk WC and selecting merge.
Chose "Merge a range of revisions". Click next. In the "URL to merge
from" select your release branch.

If you want all changes that were made in the branch to be merged into
trunk just click next. If you want to "cherrypick" only certain
revisions you can do that on this screen by clicking "Show log" and
choosing one or more revisions. The log will gray out those revisions
that you have already merged in previously if any.

> Our process works fine. I don't see why you have to select the
> conflict option from the the release version though to stop it trying
> to reintegrate the same file.

You would never use "reintegrate" on this type of branch. This is really
more for feature branches.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1199610

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-20 18:34:12 CET