diff --git a/hgext/mq.py b/hgext/mq.py index 1123bbba278d98a832b51379edb835d61f3f9679_aGdleHQvbXEucHk=..bf951d58b9172e3dee1be36032784956e5775636_aGdleHQvbXEucHk= 100644 --- a/hgext/mq.py +++ b/hgext/mq.py @@ -107,7 +107,7 @@ elif line.startswith("# Date "): date = line[7:] elif line.startswith("# Parent "): - parent = line[9:] + parent = line[9:].lstrip() elif line.startswith("# Branch "): branch = line[9:] elif line.startswith("# Node ID "): diff --git a/tests/test-mq-qpush-exact.t b/tests/test-mq-qpush-exact.t index 1123bbba278d98a832b51379edb835d61f3f9679_dGVzdHMvdGVzdC1tcS1xcHVzaC1leGFjdC50..bf951d58b9172e3dee1be36032784956e5775636_dGVzdHMvdGVzdC1tcS1xcHVzaC1leGFjdC50 100644 --- a/tests/test-mq-qpush-exact.t +++ b/tests/test-mq-qpush-exact.t @@ -26,7 +26,14 @@ $ echo cp0 >> fp0 $ hg add fp0 - $ hg qnew p0 -d "0 0" + $ hg ci -m p0 -d "0 0" + $ hg export -r. > p0 + $ hg strip -qn . + $ hg qimport p0 + adding p0 to series file + $ hg qpush + applying p0 + now at: p0 $ echo cp1 >> fp1 $ hg add fp1 @@ -63,15 +70,6 @@ $ hg qpop -aq patch queue now empty - $ hg qpush -ea - applying p0 - applying p1 - now at: p1 - $ hg parents -qr qbase - 1:d7fe2034f71b - $ hg qpop -aq - patch queue now empty - qpush --exact when at another rev $ hg update 0 -q