From patchwork Sun Dec 16 22:34:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [19,of,24] mq: stabilize update after strip of parent revision From: Mads Kiilerich X-Patchwork-Id: 143 Message-Id: Date: Sun, 16 Dec 2012 23:34:14 +0100 # HG changeset patch # User Mads Kiilerich # Date 1355687458 -3600 # Node ID b03e365968f876ad504b324c93737434b9397731 # Parent 8e79a682878e79a4119dfd3e907476204ebd0f99 mq: stabilize update after strip of parent revision diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -3042,7 +3042,7 @@ del q.applied[start:end] q.savedirty() - revs = list(rootnodes) + revs = sorted(rootnodes) if update and opts.get('keep'): wlock = repo.wlock() try: diff --git a/tests/test-mq-strip.t b/tests/test-mq-strip.t --- a/tests/test-mq-strip.t +++ b/tests/test-mq-strip.t @@ -309,16 +309,16 @@ 2 different branches: 2 strips $ hg strip 2 4 - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) $ hg glog - @ changeset: 2:65bd5f99a4a3 + o changeset: 2:65bd5f99a4a3 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d | - o changeset: 1:ef3a871183d7 + @ changeset: 1:ef3a871183d7 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: b