> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: Thursday, June 16, 2005 5:53 PM
> 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 5:28 PM, Rule, Chris wrote:
> >
> > 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.
> >
>
> Because if you try apply a patch twice, you'll often get conflicts.
>
I agree with that statement. But after the merge and a commit to the
branch, then a subsequent merge shouldn't create the same patch because
there shouldn't be any differences unless they were due to changes on
the branch.
I apologize if I'm sounding harsh or otherwise annoying. I'm just trying
again to understand how merging works so I can then explain to others in
my group if we ever get to the point of using Subversion as our code
config tool. It will be a hard sell in any case.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 02:12:16 2005