[MERGE] Fix bug #235407, when the same revision is merged twice

[Martin Pool]

On Tue, Jun 3, 2008 at 8:42 AM, Robert Collins
<robertc at robertcollins.net> wrote:
> On Mon, 2008-06-02 at 11:12 -0500, John Arbash Meinel wrote:
> Personally, I'd rather we didn't have little workarounds like that
> cropping up - they do accumulate. If there is a workaround (e.g.
> 'shelve; revert; upgrade your bzr; merge again) then I think its fine to
> accept that a confused tree in the wild is not fixed purely by upgrading
> bzr.

That's ok with me.  If it hypothetically turned out that people had
committed this to history and it was breaking log then that would be
different.

-- 
Martin <http://launchpad.net/~mbp/>