[issue2849] mq series loses order after rebase

Idan Kamara bugs at mercurial.selenic.com
Sun Jun 12 09:16:16 CDT 2011


New submission from Idan Kamara <idankk86 at gmail.com>:

test script follows (basically test-rebase-mq.t with 'hg qseries' before and 
after rebase):

  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > graphlog=
  > rebase=
  > mq=
  > 
  > [mq]
  > plain=true
  > 
  > [alias]
  > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
  > EOF

Rebase with guards

  $ hg init foo
  $ cd foo
  $ echo a > a
  $ hg ci -Am a
  adding a

Create mq repo with guarded patches foo and bar:

  $ hg qnew foo
  $ hg qguard foo +baz
  $ echo foo > foo
  $ hg qref
  $ hg qpop
  popping foo
  patch queue now empty

  $ hg qnew bar
  $ hg qguard bar +baz
  $ echo bar > bar
  $ hg qref

  $ hg qguard -l
  bar: +baz
  foo: +baz

  $ hg tglog
  @  1:* '[mq]: bar' tags: bar qbase qtip tip (glob)
  |
  o  0:* 'a' tags: qparent (glob)
  
Create new head to rebase bar onto:

  $ hg up -C 0
  0 files updated, 0 files merged, 0 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
  $ echo a >> a
  $ hg qref

  $ hg tglog
  @  2:* '[mq]: bar' tags: bar qbase qtip tip (glob)
  |
  | o  1:* 'b' tags: (glob)
  |/
  o  0:* 'a' tags: qparent (glob)
  

Rebase bar (make sure series order is preserved):

  $ hg qseries
  bar
  foo

  $ hg -q rebase -d 1
  $ hg qseries
  foo
  bar

  $ hg qguard -l
  foo: +baz
  bar: +baz

----------
messages: 16490
nosy: idank
priority: bug
status: unread
title: mq series loses order after rebase

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


More information about the Mercurial-devel mailing list