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

Re: Create a copy in WC before merging

From: Ben Voigt <richardvoigt_at_gmail.com>
Date: Mon, 14 Dec 2009 22:47:54 -0800 (PST)

On Dec 14, 1:39 am, welo <walid_alkaak..._at_yahoo.com> wrote:
> Hi list,
>
> Iam searching for a feature in Subversion that i used in CVS.
> After  checking out a file and working on it and before i update with WC i want to create automatically a copy of my file,the purpose is that i need to compare between my file before updating and the updated -merged copy- that contains my work and other works.
>
> How can i do this? any property?

The three-way merge in TortoiseMerge is ideal for this, you see the
common base, your local working copy changes, and the changes already
checked in to the repository, and can cherry pick between the
versions. Problem is, TortoiseSVN won't start the three-way
interactive merge if it thinks it can do it automatically, but there's
a trick to stopping that:

http://www.blendedtechnologies.com/how-to-turn-off-auto-merge-in-subversion/33

>
> Best wishes
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2430448

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-15 07:50:25 CET

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