[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 03:46:37 CEST

On Jun 16, 2005, at 7:10 PM, Rule, Chris wrote:
>
> 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.
>

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

"Merging changes sounds simple enough, but in practice it can become
a headache. The problem is that if you repeatedly merge changes from
one branch to another, you might accidentally merge the same change
twice. When this happens, sometimes things will work fine. When
patching a file, Subversion typically notices if the file already has
the change, and does nothing. But if the already-existing change has
been modified in any way, you'll get a conflict."

Maybe if you have some specific examples, we could help clarify.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 03:49:16 2005

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