Handling unmergeable files -- a call to arms

[Paul Schauble]

I don't think 4 works. There may be hundreds of Bazaar repositories that
contain the file, many of which are currently unreachable by network.
For a lock to work it would have to lock every single one of these
repositories. And you can't do it.

I think the best that can be done in this case is to keep all of the
conflicting versions of the file in the repositories as they are updated
and to note the conflict as requiring human intervention. This doesn't
necessarily leave you merging by eye. A lot of work processors and
graphics programs have merge features. But Bazaar can't do it.

    ++PLS

-----Original Message-----
From: bazaar-bounces at lists.canonical.com
[mailto:bazaar-bounces at lists.canonical.com] On Behalf Of Ian Clatworthy
Sent: Friday, May 29, 2009 2:16 AM
To: Stephen J. Turnbull
Cc: David Ingamells; Bazaar List
Subject: Re: Handling unmergeable files -- a call to arms

Stephen J. Turnbull wrote:

> Well, three, I guess.  There's also
> 
> 3.  Grit your teeth, let the deadline slip, and while you're on the
>     bus invent and implement a merge algorithm for the heretofore
>     unmergeable file. :-)

and ...

4. Grab a mobile phone and call someone at the office (or online) and
   ask them to grab the lock on your behalf.

Ian C.

CONFIDENTIALITY NOTICE:

This message contains information which may be confidential or privileged.  If you are not the intended recipient, be aware that any disclosure, copying, distribution or use of the contents of this information is prohibited.  If you have received this transmission in error, please notify me immediately by telephone.