Syncro SVN Client

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

Other Syncro SVN Client issues not covered by the other forums.

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

Postby fantomet » Mon Oct 27, 2008 4:40 pm

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
fantomet
 
Posts: 2
Joined: Mon Oct 27, 2008 4:09 pm

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

Postby fantomet » Mon Oct 27, 2008 4:56 pm

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

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

Postby tavy » Tue Oct 28, 2008 1:58 pm

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
tavy
 
Posts: 52
Joined: Wed Jan 31, 2007 2:53 pm


Return to Other Issues

Who is online

Users browsing this forum: No registered users and 0 guests

cron

© 2002-2013 SyncRO Soft Ltd. All rights reserved. | Sitemap | Terms of Use | Privacy Policy | This website was created & generated with <oXygen/>® XML Editor