7

I'm trying to automate some Subversion processes and I'm running into problems with conflicts. When I merge two branches, sometimes I get tree conflicts and regular (text) conflicts. I'd like to be able to resolve everything using the repository copy:

svn resolve . -R --accept theirs-full

but if there are tree conflicts, it yells at me and says I have to resolve them to the working state.

svn: warning: Tree conflicts can only be resolved to 'working' state; 'file' not resolved

Is there an easy way to resolve just the tree conflicts to 'working' so that I can then continue to resolve the text conflicts with theirs-full? Or maybe another way to accomplish my goal entirely? I'm looking to do this through the Windows command line. Thanks!

Subversion server is version 1.6.6

I'm using CollabNet Subversion Command-Line Client v1.6.13 (for Windows)

vincentj
  • 168
  • 1
  • 3
  • 13
  • To summarize the other post: the trick is to use the --accept theirs-full option with the *merge*, which will resolve all the text conflicts during the merge and leave just the tree conflicts. Then you can resolve the tree conflicts to working. – vincentj Oct 20 '10 at 17:29
  • You can also use --accept theirs-full with _update_, e.g. `svn up . -R --accept theirs-full` – Rune Jul 31 '12 at 00:12
  • possible duplicate of [Subversion Merge: How do I Cleanly Re-integrate a 'Definitive' Branch?](http://stackoverflow.com/questions/850304/subversion-merge-how-do-i-cleanly-re-integrate-a-definitive-branch) – Francis Lewis Feb 12 '14 at 20:26

2 Answers2

2

Simple solution/workaround:

svn st | grep "^C" | sed "s/^........//" | xargs svn resolve -R --accept=theirs-full

than just resolve tree conflicts to wc:

svn resolve -R --accept=working

Not very nice, just works.

Kribesk
  • 61
  • 2
1

Did you check this SO post?

Community
  • 1
  • 1
zellus
  • 9,617
  • 5
  • 39
  • 56