RE: strange undo failure

> I stumbled on a strange bug/feature I can't explain.
> $ svn --version
> svn, version 1.6.6 (r40053)
>
> First, create repository and make multiple simple commits:
>
> $ svnadmin create testrepo
> $ svn co file:///`pwd`/testrepo test
> Checked out revision 0.
> $ cd test
> $ touch README
> $ svn add README
> A README
> $ for i in `seq 1 10` ; do echo $i >> README ; svn commit -m $i ;
> done >/dev/null
> $ svn up
> At revision 10.
> $ cat README
> 1
> 2
> 3
> 4
> 5
> 6
> 7
> 8
> 9
> 10
>
> Now, if I undo change number 5, I expect line 5 to disappear.
> But it's not the case:
> $ svn merge --dry-run -c -5 ^/
> --- Reverse-merging r5 into '.':
> C README
> Summary of conflicts:
> Text conflicts: 1
>
> I can't understand, why?

What does the conflict show? I will attempt to see if I can work it out...

Let's see... If the rev4 version of the file is:

1
2
3
4

If the file in rev 5 contains....

1
2
3
4
5

And the file in rev10 contains

1
2
3
4
5
6
7
8
9
10

A reverse merge will do a diff between rev5 and rev4. It will which means remove the 5th line. So, in rev4 lines 6-10 are blank but in rev10 lines 6-10 have values in them. So, there is a conflict. Do you want no lines for line 6-10 or do you want the 6-10 lines in the working copy?

View the READ me and look at the conflicts. I think it will make sense to you.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2417092

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-12 16:11:53 CET