Empty merges

[Marius Gedminas]

On Mon, Feb 16, 2009 at 07:59:34AM +1100, Robert Collins wrote:
> On Sat, 2009-02-14 at 23:34 +0100, Marius Gedminas wrote:
> > 
> > I think it's expected behaviour.  I personally dislike it, but I'm
> > sure
> > people may argue it's just a corner case of something that has a
> > perfectly good logical reason to be that way.
> 
> Its a reasonable outcome of requiring that folk have the chance to
> review every merge; but its a bug - we should stop the merge when no
> differences at a logical or content level are found.

I'm glad we agree here.

> (Sometimes merges record that 'A' and 'B' have reached the same place
> independently - and that would be ok to record, but the flipflops are
> not).

For reference, here's the bug in launchpad:
https://bugs.launchpad.net/bzr/+bug/69489

Marius Gedminas
-- 
Suppose you went back to Ada Lovelace and asked her the difference between a
script and a program. She'd probably look at you funny, then say something
like: Well, a script is what you give the actors, but a program is what you
give the audience.
                -- Larry Wall
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090216/0225b56f/attachment.pgp