Release branch created from older trunk revision, merging back changes to trunk fails (TSVN1.6.16, SVN1.4.2)

Hello,

We have created a release branch from an older trunk revision (e.g. not
the HEAD of the trunk at the time of creation of the release branch, but
older). Then we made changes to both the release branch and the trunk,
and when trying to merge the changes from the release branch to the
trunk using the 'Merge a range of revisions' merge dialog, we get
unexpected results involving the files that were changed on trunk
between the revision on which we based the release branch and the
revision of the actual release branch creation.

We use TortoiseSVN 1.6.16 and SVN server v1.4.2, so merge tracking is
not available.

Repo layout:

Project/trunk

Project/branches/release/1.0

Relevant changesets:

rev100: starting point

rev101: add fileT1 to trunk

rev102: change fileT2 on trunk

rev150: create release branch 1.0 from trunk rev100

rev151: change fileR1 on release branch 1.0

rev152: change fileR2 on release branch 1.0

rev160: change fileT3 on trunk

At that point we used the 'Merge a range of revisions' merge dialog (on
a working copy of trunk): we set 'URL to merge from' to
branches/release/1.0 and via the Show Log button we selected all
changesets of the release branch (150-152 in this example). On the next
screen, we leave all the 'ignore' checkboxes unchecked, Merge depth is
'working copy' and Compare whitespaces is selected.

Results:

The merge itself gives no errors: the changes from 150-152 are applied,
and the change in file T3 is untouched, but the following unexpected
things happen:

- file T1 is deleted

- the change on file T2 from rev102 is reverted

What did we do wrong here? We expected that a merge from release branch
to trunk would not change things that have not been touched in the
release branch.

Thanks,

Dennis Verheijen

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-23 11:06:54 CET