[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: Adam Gibson <agibson_at_ptm.com>
Date: 2005-04-07 20:25:13 CEST

Johan Appelgren wrote:
> On Apr 7, 2005 5:26 PM, Karan, Cem (Civ, ARL/CISD) <CKaran@arl.army.mil> 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?

Why not just allow the merge to work normally since the merge will
result in local changes only and then run a diff tool like meld(linux
only) to review the changes before check-in. Meld integrates with
subversion and allows you to remove a local change if needed right
through the gui interface. I am sure there are plenty of gui diff tools
for windows that have similar features.

This scheme works great for my uses. Is there some other reason that
this would not work for you?

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:29:46 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.