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

Re: Merge - tools or tutorial

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-07-26 13:09:36 CEST

On 26/07/07, DistillingTortoise <renatosviana@yahoo.com.br> wrote:
> I am new using the merge with tortoise and I would like to know if there is
> a better tool to apply my modifications or the diff/merge feature in the
> tortoise should be sufficient?
>
> I also didn't find a good examplanation about the diff/merge in the tortoise
> tutorial.

That depends what you want to do.

Merging local changes and changes from the repository is done by
Subversion. If there are conflicts, these have to be resolved using a
3-way merge tool. You can use TortoiseMerge for that, or you can use
any one of a number of 3rd party tools as explained in our manuals
(look under settings in the 1.4.x manual).

Diffing changes can also be done using TortoiseMerge, or a 3rd party
diff program, again as described in the manual.

Applying patches and comparing your WC with an older revision requires
handling of unified diff files, which can only be done using
TortoiseMerge as it handles fetching of the required files from
Subversion automatically.

Personally I use TortoiseMerge all the time. Others like to use
WinMerge or KDiff3. UltraCompare looks promising too, although it's
not free.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jul 26 13:08:22 2007

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