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

Rollback issue

From: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Fri, 2 May 2008 17:35:59 +1000

Hi All,

I posted this email on the User forum and was directed to post it on the
developer forum as it may be a bug.

Please inform me if this is an inappropriate question at this forum.

I am using svn 1.4.6 on Windows 2003 server SP1.
Scenario 2 works as expected but Scenario 1 fails with a conflict.

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.



This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-02 09:36:14 CEST

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

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