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

Re: merge not merging (useless result and poor docs)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-01-23 15:44:41 CET

On Jan 23, 2005, at 1:39 AM, matthew ford wrote:
>
> The docs need considerable improvement on this point, as does the
> resulting
> merge
>

Can you be specific as to how they need improvement? They go through
bunches of examples. All of the examples assume there is some
relationship between the branch and trunk, not two arbitrary trees that
you happen to import. You're doing something different than the norm.

The 'svn merge' command compares two trees, generates a patch, then
applies that patch to a working copy. Yes, you have complete freedom
to compare any two trees, and thereby generate any patch you want. But
that does *not* mean that 'svn merge' always will do what you want.
It's *your* responsbility to make sure that the patch being produced
makes sense, and cleanly applies to your working copy.

>
>
> Skipped 'src'
> Skipped 'src'
> Skipped 'src\au'
> Skipped 'src\au\com'
> Skipped 'src\au\com\forward'
> Skipped 'src\au\com\forward\codeSections'
> A src\au\com\forward\codeSections\DesignNotes.txt
> A src\au\com\forward\codeSections\CodeSections.java
> Skipped 'src\au\com\forward\codeSections\testFiles'
> A src\au\com\forward\codeSections\testFiles\testin.cs
> A src\au\com\forward\codeSections\CodeSections.cs
> A src\au\com\forward\codeSections\buildzip.bat
> A src\au\com\forward\codeSections\MainClass
> A src\au\com\forward\codeSections\build.xml
> Skipped 'docs'
> Skipped 'docs'
> A docs\htmldoc.exe
>

See those skipped messages? That indicates driver error. The merge
command is trying to add and remove certain directories because they're
not related to each other at all. Please read this section of chapter
4, regarding ancestry:

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

Then after reverting, try the merge again with the --ignore-ancestry
command.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 23 15:47:56 2005

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