Page 1 of 1

'diff-cmd' and 'diff3-cmd' in config file

PostPosted: Mon Oct 27, 2008 4:40 pm
by fantomet
Hello

Basicly, I am trying to force all merged files into a conflicted state.

This works fine with eg. tortoiseSVN if you follow these simple steps found here:
http://tortoisesvn.net/node/241

Our team as a whole has chosen to use syncro.

My question is whrether syncro SVN client (v. 4.0) uses these settings in the config file or just ignores them (as it seems to me) ?

And,

If you know of a workaround to force the changed files into a conflicted state during a merge.

Thank you.

fantomet

Re: 'diff-cmd' and 'diff3-cmd' in config file

PostPosted: Mon Oct 27, 2008 4:56 pm
by fantomet
It should be noted that so far I have only used the "test-merge" and watched the file flags.

Re: 'diff-cmd' and 'diff3-cmd' in config file

PostPosted: Tue Oct 28, 2008 1:58 pm
by tavy
Hello,

Thank you for contacting us.
Syncro SVN Client does not use 'diff-cmd' and 'diff3-cmd' options from the subversion config file when it performs the merge operation. I added an issue on our internal issue tracker to investigate this. When this will be fixed we will contact you. At this moment I don't have an workaround to force the changed files to be in conflict state when the merge operation is performed.

Best regards,
Octavian Nadolu