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

Re: backing out update after conflicts

From: Ryan Schmidt <subversion-2007a_at_ryandesign.com>
Date: 2007-03-20 21:08:17 CET

On Mar 20, 2007, at 10:33, Ulrich Eckhardt wrote:

> I just had the case that an update failed due to some conflicts
> (several of
> which were in fact due to changes in line endings). Now, how do I
> back out
> from this update? I would have expected a simple update to the former
> revision to solve the problem, but instead it created even more
> conflicts! To
> be honest, I would even consider that a bug. Due to the amount of
> changes
> (linendings!) the merged representation is absolutely useless, I
> basically
> only have two versions of the same file concatenated and can start
> comparing
> the mess manually. Or did I do something wrong, should I have done
> something
> different?

True... I don't know of a way to tell Subversion to undo its
conflicted state there. However, you'll see that you have some other
new files in the directory. For example, if foo is the conflicted
file, you should also have foo.r42, representing the state of the
file at revision 42 before you made changes, foo.r46, representing
the new file revision 46 that was just downloaded during the update,
and foo.mine, representing the file at revision 42 plus your changes.
You could use a diff program to compare and two of those files to see
what's changed between them. You could even copy any of those on top
of the main foo file and then work from there.

To reply to the mailing list, please use your mailer's Reply To All  
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 20 21:08:46 2007

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.