RE: How does Undoing Change Show Up in History

> Change reverted. What does my log show?
>
> $ svn log -v foo.txt
> ------------------------------------------------------------------------
> r3 | dweintraub | 2009-05-04 17:03:26 -0400 (Mon, 04 May 2009) | 1 line
> Changed paths:
> M /foo.txt
>
> Reverting to revision 1
> ------------------------------------------------------------------------
> r2 | dweintraub | 2009-05-04 17:02:54 -0400 (Mon, 04 May 2009) | 1 line
> Changed paths:
> M /foo.txt
>
> Removing third line
> ------------------------------------------------------------------------
> r1 | dweintraub | 2009-05-04 17:02:21 -0400 (Mon, 04 May 2009) | 2 lines
> Changed paths:
> A /foo.txt
>
> Adding file foo.txt
>
> ------------------------------------------------------------------------
>
>
> Why doesn't my log show the merge. It only shows the change and not
> the fact I removed change #2 from my file.

r3 is the result of your merge. Svn doesn't know that when you commit rev3 it was the result of a merge command. You could have hand edited it with the same change and commit it with the same result.

There is no way to know if a commit is due to a merge, hand edit, applying a patch, applying a diff. They all look the same to svn.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-04 23:20:58 CEST