Does subversion have a simple "diff" between folders in the repository?

["Rule, Chris" <Ch...@tbe.com>]

What I'm wanting to do is merge between two different folders in the
repository and apply the changes to a working copy that is a checkout
from one of the folders. Here's my repo setup:
 
repo/branch/working
repo/tags/version12
repo/tags/version12-r1
repo/tags/version12-r2
repo/tags/version12-r3
repo/trunk
 
WC: checkout from repo/branch/working
 
All are historically related to trunk at some point in the way past, but
not directly. What I want is to compare the current versions of files in
repo/tags/version12-r3 with the current versions of files in
repo/branch/working and apply the differences to the working copy. To my
simple mind this should be the HEAD of each folder, but reading the
documentation, listening to the users list, and doing some testing leads
me to believe this won't work. However, I'm not sure which revision
numbers to use.
 
There really ought to be an easy way to do this, and I can't imagine why
merge tracking would even come into play.
 
Help?
 

Re: Does subversion have a simple "diff" between folders in the repository?

[Ben Collins-Sussman <su...@collab.net>]

On Jun 16, 2005, at 11:40 AM, Rule, Chris wrote:


> There really ought to be an easy way to do this, and I can't  
> imagine why merge tracking would even come into play.

$ cd working-copy

$ svn merge URL-to-12-r3 URL-to-working .


Remember that 'svn merge' takes two URLs to compare -- any two URLs  
at all.  Read this section of the book if you want more clarification:

   http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.2



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org