multiple merge question

[Dmitri Colebatch <di...@colebatch.com>]

Hi all,

I'm going to start this email by saying that I'm typically very
comfortable merging in my native CVS environment but I must be missing
something in SVN as I'm hitting a problem merging a binary file.

I have a file:

http://svn/tJunction/trunk/tJunction-schema/vehiclespecification/2004/04/01/doc/Sample_VehicleSpecificationMsg.xls

and I want to merge it with:

http://svn/tJunction/branches/tJunction_sd_1_1/tJunction-schema/vehiclespecification/2004/04/01/doc/Sample_VehicleSpecificationMsg.xls

Earlier today I was asked to merge this file, and I did so with:

svn merge -r 12044:16776
http://svn/tJunction/trunk/tJunction-schema/vehiclespecification/2004/04/01/doc/
.

from within

C:\1_1\tJunction\tJunction-schema\vehiclespecification\2004\04\01\doc

which is my WC.  I then committed that, tagged it and deployed to
test.  Someone found a problem and asked me to merge again (the
someone in this case is a non-technical user who is making changes on
trunk and asking me to deploy them - I realise that in a perfect world
I would ask her to checkout the branch and make her changes there, but
....).

I am now trying to merge again like so:

svn merge -r 16777:16784
http://svn/tJunction/trunk/tJunction-schema/vehiclespecification/2004/04/01/doc/
.

but am getting a conflict.  I'm tempted to just copy the file across
by hand, but being new to SVN I'd like to make sure I understand
everything thats going on here.  Why is it that having already merged
the changes that had been made to the file since the branch was
copied, I know cant merge the remaining changes?

Any tips would be gratefully appreciated.  I'm sure I must be doing
something stupid.

cheers
dim

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org