Re: [Monotone-devel] problem with update after merge (was: Re: db query error on propagate, monotone 0.16)

[Georg-W. Koltermann]

Am Montag, den 17.01.2005, 14:40 -0800 schrieb Nathaniel Smith:
> >         monotone: warning: update edge
> 5419a30854a07e05a0a6c05f353ee9f6b80014f9
> >         -> b4869a21118e845b3da273aed0dc4c6ecbb0a6d4 ignored since it
> exits
> >         branch test-main
> >         monotone: already up to date at
> 5419a30854a07e05a0a6c05f353ee9f6b80014f9
> 
> Huh, weird.  I've added a test for this, but I can't reproduce it --
> seems to work fine.  Can you give more details?

It turned out to be more complicated than I thought.  The buglet does
not appear if I only have one changeset in the branch that I'm merging,
er, propagating.  It does appear with two, and probably with more.

I am attaching a script and the corresponding output exhibiting the
problem.  The script is for 2d2a7e250d78513c9b1118616761bf96a529053d,
earlier releases had a slightly different command syntax.

--
Regards,
Georg.

mtn-newtest.out
Description: Text document

mtn-newtest.sh
Description: application/shellscript