Question

We ve got a sizable chunk of auto-generated code that we keep around in subversion. Sometimes I m working on a piece of the generator while another coworker is working on a different piece of the generator. One of us checks in, and the other gets the latest. Now our generated code is in conflict. Because it s generated it ll be correct after the next time the generator is run, but subversion has flagged it as conflicted. It s a bit of a pain to go around, find these conflicts, verify that they are indeed due to generated code, and then manually "accept mine" to clear the conflicts.

Is there a way to have subversion recognize that for all the files in a given folder I just want to automatically accept mine? I d like to stay away from dedicated batch files, as most of the office uses Tortoise SVN and I m looking for a solution that everyone can use.

Answer 1

You should probably avoid having generated files in SVN in the first place - as you can tell, this is a source of conflicts. Better to have them be ignored, and build them as part of the build.

But as to your question, you should be able to use the --accept mine-full option to svn update, which makes conflicts automatically resolve to mine. See the Subversion manual and man pages for more details.

Answer 2

Answer 3

That should be

svn resolve --accept [postpone|base|mine-full|theirs-full|edit|launch]

No?

友情链接