[issue844] mqmerge sequence blows up if saved queue is popped first

Patrick Mézard mercurial-bugs at selenic.com
Sat Nov 24 15:19:18 CST 2007


New submission from Patrick Mézard <pmezard at gmail.com>:

I think it is related to issue 764, if the current queue is popped first then
strip is called afterwards and everything is fine.

MqMerge wiki entry ends the sequence by popping the current queue then the saved
one, but the hg book says the saved queue can be popped and deleted afterward,
not talking about the current queue. Maybe we should add a temporary warning in
the book.


#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "hgext.mq=" >> $HGRCPATH

hg init t2
cd t2
echo a > a
hg ci -Am init
echo b >> a
hg qnew -f changea
hg qsave -c -e
hg up -C 0
HGMERGE=true hg qpush -m -a
hg manifest
# Pop the saved queue first.
# It works fine if the current queue is popped first
echo % pop the saved queue
hg qpop -a -n patches.1
echo % pop the current queue
hg --traceback qpop -a
echo % pushing back
hg qpush -a
hg verify

----------
messages: 4362
nosy: pmezard
priority: urgent
status: unread
title: mqmerge sequence blows up if saved queue is popped first
topic: mq

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue844>
____________________________________________________



More information about the Mercurial-devel mailing list