On 2007-12-10 12:02-0700, Gus Hart wrote:
>This is my first post to the list.
>
>I find it incredible that such a thing as automatic merging even
>exists. SVN is writing code for you! Be that as it may, how can I
>prevent automatic merging?
>
>I hunted around for this topic on the web and found someone's
>suggestion to add the following to the ~/.subversion/config file:
>diff-cmd=/usr/bin/false
>diff3-cmd=/usr/bin/false
>
>but alas this doesn't work. I still get the dreaded "G" tag when
>updating. I have a feeling that somehow the config file is being
>ignored as changing the "editor-cmd" value didn't change anything
>either...
>
>Please help if you can. Thanks!
>-GH
This has always been one of my pet peeves CVS and it annoyed me that it was
carried over into SVN. Why isn't automatic merging an OPTION? A "mostly
works" solution isn't great for every team or type of repository. I don't
think there is a way to force a C instead of a G. I have looked for this and
never found a good answer. Let me know if you find a good solution to force
conflicts.
Some have said automatic merging is RARELY a problem, but I have personally
been burned by this more than once and now I just don't trust/like/want this
feature. It's particularly bad with conf files where someone adds option
settings to the top of a file and someone else adds similar settings to the
bottom of a file and you end up with a file with conflicting settings. It's
easy to miss one G-merged file when updating a lot of files. It's impossible
to miss a C-conflicted file because you can't later accidentally commit the
file without running "svn resolved" first.
--
Noah Spurrier | email: noah_at_noah.org | http://www.noah.org/wiki/engineering
-------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 10 22:21:22 2007