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

Re: How do I prevent auto-merge?

From: William Nagel <bill_at_stagelogic.com>
Date: 2005-04-07 20:48:48 CEST

You're right, marking the files as binary would also turn off the
creation of the conflict markers in the files. I didn't think about

Johan pointed to another thread in which using /usr/bin/false as the
diff command was suggested. That seems like probably the best solution
to me (although I've never tried it). You could even set that up as
the default diff command so you wouldn't have to remember to use it.
It's a client configuration option, though, so you'd need to make sure
all of your developers set up that configuration (which is easy if you
have administration control over their machines, just set it in
/etc/subversion or the Windows equivalent).


On Apr 7, 2005, at 1:08 PM, Karan, Cem (Civ, ARL/CISD) wrote:

> Yeah, I looked at that, but doesn't that just tell subversion that
> this file can't be merged, and that it should do a full copy, or
> something like that? What I want to do is have the regular conflict
> markers, etc. in my text files, but to also have them even when
> subversion thinks that the merges are harmless. That would give me a
> chance to look at the files to decide if they really ARE harmless.
> Basically, I'm thinking of the situation where a file has two parts
> that are interdependent, but seperate. E.g. I define a struct with
> some stuff in it at the top of the file. Loads of stuff gets added in
> and removed over time, until, one day, someone removes the stuff in
> the struct (changing nothing else in the file) and someone else
> changes something below that that is dependent on the thing in the
> struct. Won't subversion merge them directly? After all, the struct
> above didn't overlap the changes in the code below, but there WILL be
> a compiler error in the combined file.
> If I can prevent automerging, then there is at least a chance that
> people will look at the files and figure out what the potential
> problems are...
> Thanks,
> Cem Karan
> -----Original Message-----
> From: William Nagel [mailto:bill@stagelogic.com]
> Sent: Thu 07-Apr-05 11:51 AM
> To: Karan, Cem (Civ, ARL/CISD)
> Cc:
> Subject: Re: How do I prevent auto-merge?
> Hash: SHA1
> I don't think there's a way to automatically do that for all files.
> You could set the svn:mime-type property to a binary type for all of
> your files. It's a hack, but I think it would do what you want.
> - -Bill
> On Apr 7, 2005, at 10:26 AM, Karan, Cem (Civ, ARL/CISD) wrote:
>> I've run into an odd problem; I want to prevent files from being
>> auto-merged when updating (when G shows up). Its not that I don't
>> want them to be merged, or that I want them to be treated as binary
>> files; I want subversion to treat all files that would be marked as G
>> to instead be marked as being in conflict, forcing manual analysis of
>> each file. Is it possible to configure the repository/client to force
>> this?
>> Thanks,
>> Cem Karan
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
> Version: GnuPG v1.2.4 (Darwin)
> iD8DBQFCVVcTSwe0AHUdEwQRApxlAKCQG7TapqkjW9lN0mLajW7tyJZgkgCfWE9Q
> GJR5d714PK7rTDEmAMV7HCk=
> =kR87

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 7 20:51:05 2005

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.