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

merge not merging (useless result and poor docs)

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-23 08:39:46 CET

Hi Ben,
I tried swapping the urls around to

C:\temp\svnTrunk>svn merge svn://localhost/svnRepos/trunk
svn://localhost/svnRepos/branch >merge2.txt

which gave the output below
and actually seemd to try and merge but the result was useless as the merged
file just consisted of the orginal file at the top and the new file at the
bottom
<<<<<<< .working
... whole file here
=======
... whole file here
>>>>>>> .merge-right.r4

The diff output gives me a much better idea of what changed then the merge
output.

Also I went back to the docs and I still cannot see how to tell which way
round to put the URLs.
The docs need considerable improvement on this point, as does the resulting
merge
matthew

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 23 08:42:37 2005

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