Steps for configuring Eclipse 3.7 (Indigo) with Subversive to use Beyond Compare 3 as the default diff and merge tool (may work with other versions too): Preferences -> Team -> SVN -> Diff Viewer Add Extension or mime-type : Diff program arguments -> Program Path : enter the path for BComp. Exe (with no arguments). E.g.
: C:\Program Files (x86)\Beyond Compare 3\BComp. Exe Diff program arguments (box): ${base}" "${mine}" /lefttitle="Base ${base}" /righttitle="Local ${mine} Merge program arguments -> Program path : path to BComp. Exe again Merge program arguments (box): ${theirs}" "${mine}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${mine})" /outputtitle="Merged (${merged}) OK.
Steps for configuring Eclipse 3.7 (Indigo) with Subversive to use Beyond Compare 3 as the default diff and merge tool (may work with other versions too): Preferences -> Team -> SVN -> Diff Viewer Add... Extension or mime-type: * Diff program arguments -> Program Path: enter the path for BComp. Exe (with no arguments). E.g.
: C:\Program Files (x86)\Beyond Compare 3\BComp. Exe Diff program arguments (box): "${base}" "${mine}" /lefttitle="Base ${base}" /righttitle="Local ${mine}" Merge program arguments -> Program path: path to BComp. Exe again.
Merge program arguments (box): "${theirs}" "${mine}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${mine})" /outputtitle="Merged (${merged})" OK.
Thank's a lot, I will give it a try and come back later. – mliebelt Oct 13 at 5:02 Sorry for the big delay ... I have tried it now, and the diff works quite well, but the merge didn't. I have documented the steps in my question.
– mliebelt Nov 10 at 15:22 Found the problem, and docuemnted it in the question. Thank's a lot again. – mliebelt Nov 10 at 15:32 np.
Not sure why the merge wouldn't work normally, although I've only used it a few times when merging a conflict on update, and I usually update from outside Eclipse (TortoiseSVN / terminal). – Tom Clift Nov 11 at 5:28.
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.