[PATCH 19 of 24] mq: stabilize update after strip of parent revision

Kevin Bullock kbullock+mercurial at ringworld.org
Mon Dec 17 15:25:21 CST 2012


On Dec 17, 2012, at 3:08 PM, Bryan O'Sullivan wrote:

> On Sun, Dec 16, 2012 at 2:34 PM, Mads Kiilerich <mads at kiilerich.com> wrote:
> mq: stabilize update after strip of parent revision
> 
> This is changing some test output that looks like it might be meaningful in a way that I can't interpret, since I don't use glog. Maybe a little more text about why this is safe?

This appears to (possibly) fix an actual bug. With graphlog, the '@' marks the parent(s) of the working dir. In the current test, the working dir ends up on a revision that isn't an ancestor of the working dir before the strip.

What I'm wondering, though, is does it actually fix the bug? After this change, will the working dir deterministically end up on an ancestor of where it was before?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list