Re: merge conlict?

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  "Mark A. Hershberger" <address@hidden>,  
> address@hidden
> Date: Mon, 25 Jan 2010 22:02:46 -0500
> 
> I've just added
> 
>    append_revisions_only = True
> 
> to the .../trunk/.bzr/branch/branch.conf which should reject a "bzr
> push" that does this kind of ancestor-shifting.

Are you sure we understand the consequences enough to make such a fast
decision without testing it first?  What was the rush?