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

Re: after merge, svn st -u fails with XML error

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-12 15:51:41 CET

Jan Evert van Grootheest wrote:

> Ben,
>
> Thanks. I was really worried.
>
> I guess I misunderstood this from the 0.37 release notes:
> * 'svn merge' now notices ancestry by default. (r8390)

Here's what it means:

'svn diff' and 'svn merge' are cousins; they both ask the server to
compare two trees. One command prints the diff to the screen, the other
applies the diff to your working copy as a local mod.

These two commands are able to either pay attention to the relatedness
between files, or instead, they can be "dumb" and only pay attention to
paths.

For example, suppose you import two vendor branches into your
repository. The trees are totally unrelated to each other. If you run
'svn diff URL1 URL2', then by default it will be "dumb" and compare all
files which have the same path. If you pass the '--notice-ancestry'
flag, then it will instead show the delete of each file, and the add of
a new file by the same name. When operating in 'smart' mode, it's not
paying attention to identical paths, but rather to the fact that the
files are related to each other (or not.)

'svn merge' is now smart by default. If you want 'svn merge' to be
dumb, pass it the '--ignore-ancestry' mode, and it will only care about
identical paths.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 12 15:52:54 2004

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