Question

Is there a way to tell subversion ‘update/merge unless it would cause a conflict’?

I know you can use --dry-run / status -u to check before running the update, but I often have others running updates and getting broken webpages because they don’t notice the ‘C index.php’ line.

I’ve also noticed that svn doesn’t seem too unhappy about conflicts – it still says ‘updated to revision blah’ and exits zero, regardless of conflicts. So I have to parse the line-by-line output to discover them. Surely there’s a better way?

Answer 1

You can use the –accept parameter to indicate what should happen when a conflict occurs:

--accept ARG             : specify automatic conflict resolution action                           ('postpone', 'base', 'mine-full', 'theirs-full',                           'edit', 'launch') 

See also the interactive conflict resolution page in the svnbook