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

Problems with merging...

From: Pev <pev_at_sketchymonkey.com>
Date: 2006-03-20 13:38:46 CET

Hi all,

   I have a repository where someones made a mess of a file. The history
is :

  r14 : Good work version
  r75 : Someone checked in a broken change
r108 : Current HEAD

So, I want to use merge to bring this change forward again. If I try :
    svn diff -r 14:108 svn://svnserver/projects/test1/trunk/notes.txt

you can see :

   Index: notes.txt
   ===================================================================
   --- notes.txt (revision 14)
   +++ notes.txt (revision 108)
   @@ -31,7 +31,6 @@
        STRINGVAR30=00

    ; This is where we're changing
   - STRINGVAR31=XX
    ; This is after where we're changing
    ;
       STRINGVAR32=00

so, I know the revisions are correct. If I then try :
    svn merge -r 14:108 svn://svnserver/projects/test1/trunk/notes.txt

Theres no output from the merge and svn stat shows no changes.

Alternatively, trying the other way of writing it :
    svn merge svn://svnserver/projects/test1/trunk/notes.txt_at_14 \
      svn://svnserver/projects/test1/trunk/notes.txt_at_108

has the same result. I've also tried r14:r75 and it's the same.

This has been tested with clients :
   - 1.2.3 (r15833) on Windows
   - 1.2.3 (r15833) on FreeBSD (directly on the server)

I've also tried doing the same merge using TortoiseSVN and I get
a message :
   "Error Attempted to get checksum of a *non*-file node"
which seems erroneous as it's definately a file! :

   C:\....>svn info notes.txt
   Path: notes.txt
   Name: notes.txt
   URL: svn://svnserver/projects/test1/trunk/notes.txt
   Repository UUID: 1ad5fae4-e50b-0410-89bc-d59502058e6b
   Revision: 108
   Node Kind: file
   Schedule: normal
   Last Changed Author: johndoe
   Last Changed Rev: 75
   Last Changed Date: 2006-03-02 14:42:39 +0000 (Thu, 02 Mar 2006)
   Text Last Updated: 2006-03-20 12:13:56 +0000 (Mon, 20 Mar 2006)
   Properties Last Updated: 2006-03-20 12:07:49 +0000 (Mon, 20 Mar 2006)
   Checksum: 01a3ec8af1183404cc18d80aeab08bad

Has anyone got any suggestions other than manually copying in the
changes and committing? Alternatively, can I get any more verbose
info from "svn merge" to see what it's doing / failing?

Best Wishes,

~Pev

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 20 13:43:32 2006

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