Hello,
I am having a problem with "merge --accept theirs-conflict": it seems like it
is working like "merge --accept theirs-full".
I am trying to get changes from different branch and merge them to my working
copy (running this command in my working copy directory /some/thing):
"svn merge -c 27497
https://svn.server/repos/product/acme/branches/36/some/thing/file.i file.i
--accept theirs-conflict "
I expect it to work like this: if there is a conflict in a file upon the merge
it will take those conflicting parts from "theirs" revision 27497. All changes
in revision 27497 should also be merged to my working copy. There should be no
other changes merged than those in revision 27947.
Now what happens: Merge resolves conflicting parts with "theirs" changes (this
is ok) but also makes other changes comparing "theirs" revision to my working
copy (?). This means that if revision 27497 includes only line additions the
merge will, for some not obvious reason, delete some lines, too (just for an
example). I would like to see only those additions in my working copy that are
made in revision 27497 - otherwise the file should be untouched.
If the merge's result is the same with "theirs-full" and "theirs-conflict", is
this a bug? Or is there some other parameter I should use?
--
Teemu
