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

Re: strange undo failure

From: Ryan Schmidt <subversion-2009b_at_ryandesign.com>
Date: Thu, 12 Nov 2009 10:39:08 -0600

On Nov 12, 2009, at 10:03, Vadym Chepkov wrote:

> Each line is a separate commit, you can easily reproduce the case.
> I expect line 5 to be removed as a result of this merge.

When merging, Subversion cannot always figure out what you meant to
have happen. This is one of those cases. The conflict means you have
to edit the file and manually tell Subversion how you want the file to
look now, then tell it you resolved the conflict with "svn resolved
filename"

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

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

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.