Alexander Klenin <klenin <at> gmail.com> writes:
> > [...]
>
> I would say that 'Backup original file' setting from TortoiseMerge
> should control this behavior -- although TMerge is not directly
> involved in whole-file conflict resolution, this still seem logical.
Unfortunately, this switch has nothing to do with the "replace with their
version" functionality. I guess TortoiseMerge is in no way involved, and
although it might be possible for TortoiseSVN to read TortoiseMerge's
configuration and make a backup copy, these are two separate programs and the
user shouldn't be forced to make a setting in TortoiseMerge to change
TortoiseSVN's behavior.
So I would propose to place such a "make backup" switch in TortoiseSVN as well
for all cases in which TortoiseSVN itself changes a file that isn't yet
versioned (I don't know if there are any other cases except the "replace with
their version" feature).
Markus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 1 09:46:35 2007