[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: How to disable automatic merging...

From: marc gonzalez-carnicer <carnicer.lists_at_gmail.com>
Date: 2007-12-10 20:37:28 CET

hi,

you sound as somebody who has VSS as his SCM tool of reference ;)

automatic merging was not invented by subversion, it exists since
very long ago. perhaps before 1980 (SCCS).

i do wonder why you would like to disable automatic merging. anyway,
you can avoid its effects if you use a graphical merging tool such as
kdiff3 you can instruct it to take either only your changes or the other
people changes.

2007/12/10, Gus Hart <gus.hart@gmail.com>:
> 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
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 10 20:38:07 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.