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

Re: Rollback issue

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: Tue, 29 Apr 2008 12:00:59 -0700

On Mon, Apr 28, 2008 at 10:44 PM, Srilakshmanan, Lakshman <
lakshman.srilakshmanan_at_police.vic.gov.au> wrote:

> Hi All,
>
> I have used subversion for over 2year and this is the first time I came
> across this problem. Even though this is a test scenario a similar issue
> could arise in live environment. I am using svn 1.4.6 on Windows 2003 server
> SP1.
>
> Scenario 2 works as expected but Scenario 1 fails with a conflict.
>
> Any assistance in this regard is greatly appreciated.
>
> Scenario 1
> --------------
> A new file abc.txt is created.
>
> File name abc.txt
> -------------------------
> Enter -- First line
> Commit (r1)
> Enter Second line
> Commit (r2)
> Enter Third line
> Commit (r3)
> Enter Fourth line
> Commit (r4)
> Fifth line
> Commit (r5)
>
> Attempting to rollback svn merge -r 3:2 causes a conflict.
> Attempting to rollback svn merge -r 5:4 succeeds.
>
> Scenario 2
> --------------
> Editing the above file as below
>
> File name abc.txt
> -------------------------
> First line
> Second line
> Enter --> This is the sixth line
> Commit (r6)
> Third line
> Fourth line
> Fifth line
> Seventh line
> Commit (r7)
>
> Attempting to rollback svn merge -r 6:5 succeeds.
>

Good point. I did not expect this to happen. My guess is that when both the
revisions that you provide in merge touch the same line (adding "Third line"
after "Second line" technically touches "Second line" as well by adding the
new line character), it creates this conflict. But the conflict is shown on
the whole file not just the line that is touched.

This may or may not be a bug with the merge command. I would like to know as
well :-)

Thanks,
-Hari
Received on 2008-04-29 21:01:54 CEST

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