backing out update after conflicts

[Ulrich Eckhardt <ec...@satorlaser.com>]

Hi!

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?

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/

Sator Laser GmbH
Geschäftsführer: Ronald Boers       Steuernummer: 02/892/02900 
Amtsgericht Hamburg HR B62 932      USt-Id.Nr.: DE183047360

**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.

**************************************************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: backing out update after conflicts

[Ryan Schmidt <su...@ryandesign.com>]

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  
function


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org