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

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-17 00:52:58 CEST

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.

---------------------------------------------------------------------
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:55:44 2005

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