On 12/10/07, Noah Spurrier <noah@noah.org> wrote:
...
From my original post
> >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
OK, this actually *does* work (forces "C" instead of "G" if two people
edit the same file) but one must be careful to eliminate spaces in the
variable definitions (I wasn't careful on the first try). (OK, maybe I
should have caught this initially but the commented-out examples
already present in the file had spaces and I just made changes without
thinking enough.)
> 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.
Exactly. Turn it *on* if you want it. Even though it sounds like I'm
definitely in the minority on auto-merging, I maintain what I said in
my original posting. Auto-merge is writing code for you. If you trust
it, great (I hope you're right). But if you don't, like me, then you
want to see the changes before committing your own.
> 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.
This is just one example where it hit me...
As for the suggestion about using branches, etc. It's too much work in
some cases. My codes only have 2-3 authors, we talk often, and
managing different branches is not worth the hassle. Now that
auto-merge is off, we just need to keep talking as we develop...
Thanks for the input everyone. I'm happy now. The thread may continue
but this is good enough for me.
-GH
---------------------------------------------------------------------
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:43:40 2007