****Main Question:
I'd like to know where i can find info on what arguments are really passed
to the diff-3 programs and what possibilities for customization there are.
****Secondary Questions:
If this is not the place to ask these questions, then please point me in the
right direction, and if this is the place to ask, then...read ahead:
I want to launch a custom 3 way diff/merge utility (more specificly araxis
merge pro) when svn update or svn merge detects a conflict. I can't seem to
get the custom 3-way merge program to lauch at all. When i tried to find
info in "the handbook" it struck me that the info regarding launching custom
diff-3 programs might be a bit thin. Anyone who has managed to get araxis
merge pro to play ball with svn and could give me a hint on how to go about
it?
***Bacground:
When I run 3:rd party merge utilities, I want to be able to pass the two
conflicting files and the common basefile to the merge program, merge the
conflicts, review how the automerged stuff turned out (paranoia) and just
press "save" when i've eliminated all conflicts. Now, after the svn update
or merge conflict is detected, the versioned file is filled with conflict
markers (which the merge utility does not expect). No problem, you make the
merge with the files fetched by subversion, but when you save your file you
must remeber to save it over conflict marked file, which is a teensy bit
annoying.
It would be nice if it was possible to tell svn not to fill the versioned
file with conflict markers, and just pass this and the other two files to
the 3:rd party merge-program. I have a vague recollection of ClearCase
marking the versioned file with "conflict" but otherwise leaving it "as is",
and then saving a merge result file with the conflict markers with a
".merge" extention.
Another nice alternative would be if svn could pass the filename that the
merge result shall be saved as, as arguments to the 3:rd party
merge-utility. And even better, if you could specify the order in which the
files shall be passed to the merge program, and any other swithces that you
want set for your merge-program.
What's the status on svn´s capability to do this today?
Henrik
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 10 17:49:18 2003