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

merge range of revisions or one by one

From: Bosnjak Zoran <Bosnjak_at_iskratel.si>
Date: 2007-05-08 15:15:18 CEST

Should I get the same result if I merge:

- a set of revisions from branch X to my working copy, like this:
$cd working_copy
$svn merge -r rev1:rev2 url_of_X

- or the same set of revisions, but one at the time in sequence, like this:
$cd working_copy
$<for each rev from rev1:rev2 do>
$ svn merge -r (rev-1):rev url_of_X
(rev1 is 'from revision', so it's not included in a loop)

I have 96 revisions to merge.
In the first approach I end up with one conflicted file.
But in the second approach I get no conflicts.
The reset of the branch is merged correctly.
(observed on svn 1.4.3)

Where is the trick?

Received on Tue May 8 15:15:44 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.