Re: [IRC/patches] Failed octopus merge does not clean up

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Miklos Vajna
Date: Wednesday, September 17, 2008 - 8:59 am

On Wed, Sep 17, 2008 at 10:11:02AM +0200, Jakub Narebski <jnareb@gmail.com>=
 wrote:

Sure, but given that both 'a' and 'b' merged (so none of them is subset
of the other, for example so that reduce_heads() would drop one of them)
the order of the parents will be different so the resulting commit will
differ. The resulting tree will no, I think.
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[IRC/patches] Failed octopus merge does not clean up, Thomas Rast, (Mon Sep 15, 3:48 pm)
[PATCH] Add test that checks octopus merge cleanup, Thomas Rast, (Mon Sep 15, 3:49 pm)
Re: [IRC/patches] Failed octopus merge does not clean up, Junio C Hamano, (Mon Sep 15, 4:36 pm)
Re: [IRC/patches] Failed octopus merge does not clean up, Junio C Hamano, (Mon Sep 15, 5:20 pm)
Re: [IRC/patches] Failed octopus merge does not clean up, Jakub Narebski, (Tue Sep 16, 3:53 pm)
Re: [IRC/patches] Failed octopus merge does not clean up, Andreas Ericsson, (Tue Sep 16, 11:45 pm)
Re: [IRC/patches] Failed octopus merge does not clean up, Jakub Narebski, (Wed Sep 17, 1:11 am)
Re: [IRC/patches] Failed octopus merge does not clean up, Miklos Vajna, (Wed Sep 17, 8:59 am)
Re: [IRC/patches] Failed octopus merge does not clean up, Andreas Ericsson, (Wed Sep 17, 9:40 am)