Re: TSVN auto merge question?

On Thursday 18 August 2011, you wrote:
> I asked author C,he open that file in an editor and did svn update.but
> he commit file success.

Yes, and in between he saved changes from the editor which reverted the
changes from the update. This would be clearly visible from looking at the
diff (double-click a changed file in the commit dialog). If he doesn't even
bother looking at those changes before checking them in, it's his fault for
being lazy in addition to the fault he made earlier which overwrote the
changes from the update.

In order to fix this, just make the author revert the faulty revision, e.g.
from the log window. Then, from the commit dialog, let him go through the
changes and undo those changes that should not be reverted. This should get
him used to using the diff viewer, which can also be used to back out changes
and even as editor. If he then tries to hit the commit button, he is again
wrong, because he didn't test if the changes actually work.

That said, please don't top-post, I'll ignore further replies otherwise. In
this case I also wonder if you actually bothered understanding what I wrote,
because your reply doesn't indicate any understanding.

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
**************************************************************************************
Domino Laser GmbH, Fangdieckstra�e 75a, 22547 Hamburg, Deutschland
Gesch�ftsf�hrer: Thorsten F�cking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at http://www.dominolaser.com
**************************************************************************************
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. Domino Laser GmbH ist f�r diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2824098
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].