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

save backup copy when replacing local file with "their" version

From: Markus Pohl <pohli_at_gmx.de>
Date: 2007-07-30 17:23:53 CEST

When you choose to replace the local version of a file with "their" version, it
is simply overwritten with "their" version, and nothing of "my" version is kept,
even if I previously made changes that I didn't yet commit.

This can be a problem if someone wants to choose e. g. "solve with my version"
but happens to click on "solve with their version" by mistake. Then his version
is erased.

A good solution to this could be to make a backup copy (.orig), much the same
way a backup is made when resolving conflicts.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 31 07:17:26 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.