Mercurial > hg-stable
diff tests/test-rebase-mq.t @ 14599:b28004513977
rebase: preserve mq series order after rebasing (issue2849)
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Sun, 12 Jun 2011 17:26:58 +0300 |
parents | 627e50e9e316 |
children | 2371f4aea665 |
line wrap: on
line diff
--- a/tests/test-rebase-mq.t Sun Jun 12 17:26:20 2011 +0300 +++ b/tests/test-rebase-mq.t Sun Jun 12 17:26:58 2011 +0300 @@ -250,6 +250,7 @@ $ hg qnew foo $ hg qguard foo +baz $ echo foo > foo + $ hg add foo $ hg qref $ hg qpop popping foo @@ -258,6 +259,7 @@ $ hg qnew bar $ hg qguard bar +baz $ echo bar > bar + $ hg add bar $ hg qref $ hg qguard -l @@ -272,13 +274,13 @@ Create new head to rebase bar onto: $ hg up -C 0 - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo b > b $ hg add b $ hg ci -m b created new head $ hg up -C 1 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a >> a $ hg qref @@ -290,13 +292,19 @@ o 0:* 'a' tags: qparent (glob) -Rebase bar: +Rebase bar (make sure series order is preserved): + $ hg qseries + bar + foo $ hg -q rebase -d 1 + $ hg qseries + bar + foo $ hg qguard -l + bar: +baz foo: +baz - bar: +baz $ hg tglog @ 2:* '[mq]: bar' tags: bar qbase qtip tip (glob)