> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: Thursday, June 16, 2005 11:51 AM
> To: Rule, Chris
> Cc: users@subversion.tigris.org
> Subject: Re: Does subversion have a simple "diff" between
> folders in the repository?
>
> 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
>
If this is true, then why the warnings on doing the merge twice in the
next section? It doesn't sound like the svn merge is as simple as the
"diff-and-apply" as this section of the book implies.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 00:30:27 2005