misunderstanding merge

Hi all,

A colleague deleted some code from a file in our repository, so I decided to
merge it back in w/ his other changes. This didn't work as planned. I tried
in a test repository.

svn cat -r 38 baz.txt
hi there, friend
line 1
line 2

svn cat -r 39 baz.txt
hi there, friend
line 1

svn diff -r 38:39 baz.txt
Index: baz.txt
===================================================================
--- baz.txt (revision 38)
+++ baz.txt (revision 39)
@@ -1,3 +1,2 @@
 hi there, friend
 line 1
-line 2

svn diff -r 39:38 baz.txt
Index: baz.txt
===================================================================
--- baz.txt (revision 39)
+++ baz.txt (revision 38)
@@ -1,2 +1,3 @@
 hi there, friend
 line 1
+line 2

Okay, so far so good.

svn merge -r 38:39 baz.txt
<nothing, as in, no response>

So i hacked this cruddy script to acheive my results (its probably wrong
somehow):

#!/bin/sh

WC=$1
R1=$2
svn cat -r $R1 $WC | diff3 -m $WC $WC - > $WC

but it produces what I'm looking for

What am I missing?

Thanks in advance,
Ian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 29 01:30:02 2004