How to mimic svn merge with unix tools

[Florian Kaufmann <se...@gmail.com>]

My final goal is that I can do the idea of 'cherry picking' also with
the
version control system I am forced to use at my workplace -
microsoft's vss. I
have cygwin installed, so I have all the gnu tools like diff, diff3
etc.

As far as I understand, many svn diff/merge/update operations can also
be done
using these gnu tools. So I don't really need svn. E.g. to mimic "svn
update myfile"
I get the base and the head revision of myfile and then do "diff3
myfile base head". The only difference is that a diffrent diff tool is
used.

Now I am asking myself what I have to do to mimic "svn merge -r 10:11
repos_path/branch/myfile". Anyone?

Anyway, I don't even properly understand if svn merge has 3 or 4 input
files.

trunk --- 5---...---10---11
          |
branch    \---...---15
                    |
working             X

Say I want to merge the changeset 11 into my working copy which's base
is 15.
Now does or dosen't svn merge also look at the common anchestor 5?
Does it look
at the version 15 (the base)? I'am asking this because the manual says
svn merge
might doesn't do what I want if I already did some local changes to my
working
copy. That suggests that svn merge also looks at the base revision
(here 15),
not only my working copy.

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