diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -1,5 +1,6 @@ $ cat >> $HGRCPATH < [extensions] + > mq= > graphlog= > rebase= > @@ -29,6 +30,10 @@ updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg clone a mq + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd b $ echo L1 > L1 @@ -111,3 +116,34 @@ o 2: 'R1' | +Interactions with mq: + +First queue a patch + + $ cd ../mq + $ hg qnew patch-to-rebase + $ echo C3 > C3 + $ hg add + adding C3 + $ hg qref + +Now test what happens when some mq patches are applied + + $ hg pull --rebase ../a + pulling from ../a + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + patch patch-to-rebase finalized without changeset message + saved backup bundle to $TESTTMP/mq/.hg/strip-backup/*-backup.hg (glob) + $ hg tglog + @ 3: '[mq]: patch-to-rebase' + | + o 2: 'R1' + | + o 1: 'C2' + | + o 0: 'C1' +