[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: Karan, Cem \(Civ, ARL/CISD\) <CKaran_at_arl.army.mil>
Date: 2005-04-08 15:47:23 CEST

I see what you're saying, I just don't want things to break because of an automerge allowing two mutually incompatible changes to end up in the same file at the same time. Theoretically, regression tests should catch that almost immediately (and LONG before the next commit), but that isn't guaranteed. My hope is that if all files that are different can be marked as being in conflict, then I can use the same procedures for resolving potential conflicts as I use for real conflicts.

The big use of this would be for the future; one thing that it would be possible to do is to write a GUI tool that understands subversion's conflict presentation format (both the fact that there are several files & the format within the files) to help the user resolve the conflicts. Files that would have been automerged will show up in the system in exactly the same way as real conflicts, which would reduce the amount of effort necessary to figure things out (only one way, rather than two).

Cem Karan

-----Original Message-----
From: Adam Gibson [mailto:agibson@ptm.com]
Sent: Thu 07-Apr-05 02:25 PM
To: users@subversion.tigris.org
Subject: Re: How do I prevent auto-merge?

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 Fri Apr 8 15:49:56 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.