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

Merge not merging

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

Hi Ben>Are you running this command inside a working copy of the trunk or
the
>branch?All commands are run from the working copy of the trunk.>Either way,
show us a transcript of your exact commands and their
output.C:\temp\svnTrunk>svn diff svn://localhost/svnRepos/branch
svn://localhost/svnRepos/trunk >tmp.outgivesIndex:
src/au/com/forward/codeSections/CodeSections.java===========================
========================================---
src/au/com/forward/codeSections/CodeSections.java (.../branch) (revision
4)+++ src/au/com/forward/codeSections/CodeSections.java (.../trunk)
(revision 4)@@ -28,23 +28,21 @@ /** * CodeSections *- *@author Dr.
M.P. Ford make some different changes here+ *@author Dr. M.P. Ford
make some changes here *@created October 25, 2002 *@version 1.0
October 25, 2002 */ public class CodeSections { /**- * the title of
this program and here also+ * the title of this program */- public
static final String TITLE = "CodeSections";+ public static final String
TITLE = "CodeSections"; // and here also /** * the version number
*/-//leave the next line in- public static final String VERSION_STRING =
"V1.0 25nd October 2002";-+// delete the next line /** * the input file
name */Index:
src/au/com/forward/codeSections/buildzip.bat================================
===================================---
src/au/com/forward/codeSections/buildzip.bat (.../branch) (revision 4)+++
src/au/com/forward/codeSections/buildzip.bat (.../trunk) (revision
4)@@ -14,5 +14,5 @@ "%WINZIP_HOME%\wzzip" -m -rP CodeSectionsV1_1.zip
*.* -set WINZIP_SE=+set WINZIP_SE= set WINZIP_HOME=then svn merge
svn://localhost/svnRepos/branch svn://localhost/svnRepos/trunk
>merge.txtgives 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.txtA
src\au\com\forward\codeSections\CodeSections.javaSkipped
'src\au\com\forward\codeSections\testFiles'A
src\au\com\forward\codeSections\testFiles\testin.csA
src\au\com\forward\codeSections\CodeSections.csA
src\au\com\forward\codeSections\buildzip.batA
src\au\com\forward\codeSections\MainClassA
src\au\com\forward\codeSections\build.xmlSkipped 'docs'Skipped 'docs'A
docs\htmldoc.exeDoes not look to me like any merging took place.BTW there
is no common ancester in this repository for the branch and trunk.but the
docs indicate I can merge anything to anythingmatthew

---------------------------------------------------------------------
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:27:40 2005

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