On Fri, Jun 20, 2008 at 01:53:06PM +0200, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > More worryingly, the flag is supposed to be cleaned from the objects > > after get_merge_bases() returns. I am not sure what you'll learn by > > looking at the flag here. > > That is a valid point, methinks. Probably the octopus_merge_base and the > cleanup have to be decoupled here. The cleanup should be nothing more > than calling clear_commit_marks() for every head. Actually get_octopus_merge_bases() _needs_ to clean up the flags as it calls get_merge_bases() multiple times and get_merge_bases() expects empty flags. > A test case would be desirable, but probably pretty complicated. Hmm. I > like tests when they are simple, because they are easy to verify by a > human. Miklos, any chance for such a test case? Sure, I'll write one.
Attachment:
pgpn3IkioFvqS.pgp
Description: PGP signature