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

Re: diff between two tree

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-11-01 22:07:10 CET

Julien TOUCHE wrote:
> Julien TOUCHE wrote on 29/10/2005 11:07:
>
>> How do you make a diff/merge between two tree which are two trunk from
>> different project ? is part "5.17.2. Merging Two Different Trees" from
>> the help is also relevant is this case ?

What do you mean by different projects? Are they in the same repository
or not?

>> and is there a way to get diff only for files existing in both trees ?

A diff between trees will show all differences including files only
present in one tree.

>> or only for file present in one tree ?

Why do you want to diff a file which is only present in one tree?
Diff(File, EmptyFile) = File

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
--
Received on Tue Nov 01 22:21:41 2005

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

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