This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1650

tests: add commit hashes to log commands in rebase tests
ClosedPublic

Authored by phillco on Dec 11 2017, 12:57 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG469b06b4c3ca: tests: add commit hashes to log commands in rebase tests
Summary

Commit hashes are a useful way to ensure the content of commits made in the
tests are not changing, even if we don't query every aspect of every commit.
(And some properties, like extras, are rarely printed at all.)

Many of the rebase log -G calls didn't show hashes; by adding hashes to places
that weren't showing them we can help protect those tests from unwanted
changes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Dec 11 2017, 12:57 AM
phillco added a comment.Dec 11 2017, 1:00 AM

(To make this easier to review, I sent D1651 as an abandoned diff that just makes the changes to the log -G calls. You could take that one, then run the whole test suite and accept the changes, if it'd be easier to review.)

durin42 accepted this revision.Dec 11 2017, 11:26 AM
This revision is now accepted and ready to land.Dec 11 2017, 11:26 AM
Closed by commit rHG469b06b4c3ca: tests: add commit hashes to log commands in rebase tests (authored by phillco). · Explain WhyDec 11 2017, 11:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4352

tests/test-mq-header-date.t

$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq = > mq =
> [diff] > [diff]
> nodates = true > nodates = true
> EOF > EOF
$ catpatch() { $ catpatch() {
> cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
> -e "s/^\(# Parent \).*/\1/" > -e "s/^\(# Parent \).*/\1/"
> } > }
$ catlog() { $ catlog() {
> catpatch $1 > catpatch $1
> hg log --template "{rev}: {desc} - {author}\n" > hg log --template "{rev}: {node|short} {desc} - {author}\n"
> } > }
$ catlogd() { $ catlogd() {
> catpatch $1 > catpatch $1
> hg log --template "{rev}: {desc} - {author} - {date}\n" > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
> } > }
$ drop() { $ drop() {
> hg qpop > hg qpop
> hg qdel $1.patch > hg qdel $1.patch
> } > }
$ runtest() { $ runtest() {
> echo ==== init > echo ==== init
> hg init a > hg init a
> catlog 9 > catlog 9
> >
> drop 9 > drop 9
> >
> >
> echo ==== "qpop -a / qpush -a" > echo ==== "qpop -a / qpush -a"
> hg qpop -a > hg qpop -a
> hg qpush -a > hg qpush -a
> hg log --template "{rev}: {desc} - {author} - {date}\n" > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
> } > }
======= plain headers ======= plain headers
$ echo "[mq]" >> $HGRCPATH $ echo "[mq]" >> $HGRCPATH
$ echo "plain=true" >> $HGRCPATH $ echo "plain=true" >> $HGRCPATH
$ mkdir sandbox $ mkdir sandbox
$ (cd sandbox ; runtest) $ (cd sandbox ; runtest)
==== init ==== init
==== qnew -d ==== qnew -d
Date: 3 0 Date: 3 0
0: [mq]: 1.patch - test - 3.00 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
==== qref ==== qref
adding 1 adding 1
Date: 3 0 Date: 3 0
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test - 3.00 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
==== qref -d ==== qref -d
Date: 4 0 Date: 4 0
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew ==== qnew
adding 2 adding 2
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: fc7e8a2f6499 [mq]: 2.patch - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
Date: 5 0 Date: 5 0
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: 1d9a6a118fd1 [mq]: 2.patch - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 2.patch popping 2.patch
now at: 1.patch now at: 1.patch
==== qnew -d -m ==== qnew -d -m
Date: 6 0 Date: 6 0
Three Three
1: Three - test - 6.00 1: 2a9ef0bdefba Three - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref ==== qref
adding 3 adding 3
Date: 6 0 Date: 6 0
Three Three
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Three - test - 6.00 1: 7f19ad9eea7b Three - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -m ==== qref -m
Date: 6 0 Date: 6 0
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Drei - test - 6.00 1: 7ff7377793e3 Drei - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -d ==== qref -d
Date: 7 0 Date: 7 0
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Drei - test - 7.00 1: d89d3144f518 Drei - test - 7.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -d -m ==== qref -d -m
Date: 8 0 Date: 8 0
Three (again) Three (again)
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew -m ==== qnew -m
adding 4 adding 4
Four Four
diff -r ... 4 diff -r ... 4
--- /dev/null --- /dev/null
+++ b/4 +++ b/4
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 +4
2: Four - test 2: 74ded07d166b Four - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
Date: 9 0 Date: 9 0
Four Four
diff -r ... 4 diff -r ... 4
--- /dev/null --- /dev/null
+++ b/4 +++ b/4
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 +4
2: Four - test 2: 1a651320cf8e Four - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 4.patch popping 4.patch
now at: 3.patch now at: 3.patch
==== qnew with HG header ==== qnew with HG header
popping 5.patch popping 5.patch
now at: 3.patch now at: 3.patch
# HG changeset patch # HG changeset patch
# Date 10 0 # Date 10 0
2: imported patch 5.patch - test - 10.00 2: d16a272220d2 imported patch 5.patch - test - 10.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref ==== hg qref
adding 5 adding 5
# HG changeset patch # HG changeset patch
# Date 10 0 # Date 10 0
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
2: [mq]: 5.patch - test - 10.00 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref -d ==== hg qref -d
# HG changeset patch # HG changeset patch
# Date 11 0 # Date 11 0
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew with plain header ==== qnew with plain header
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
now at: 6.patch now at: 6.patch
Date: 12 0 Date: 12 0
3: imported patch 6.patch - test 3: 8ad9ebc22b96 imported patch 6.patch - test
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== hg qref ==== hg qref
adding 6 adding 6
Date: 12 0 Date: 12 0
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - test - 12.00 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref -d ==== hg qref -d
Date: 13 0 Date: 13 0
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - test - 13.00 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
==== qnew -u ==== qnew -u
adding 6 adding 6
From: jane From: jane
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - jane 3: a05a33f187ce [mq]: 6.patch - jane
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
From: jane From: jane
Date: 12 0 Date: 12 0
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - jane 3: 5702c529dfe9 [mq]: 6.patch - jane
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
==== qnew -d ==== qnew -d
adding 7 adding 7
Date: 13 0 Date: 13 0
diff -r ... 7 diff -r ... 7
--- /dev/null --- /dev/null
+++ b/7 +++ b/7
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+7 +7
3: [mq]: 7.patch - test 3: 8dd1eb8d4132 [mq]: 7.patch - test
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u ==== qref -u
From: john From: john
Date: 13 0 Date: 13 0
diff -r ... 7 diff -r ... 7
--- /dev/null --- /dev/null
+++ b/7 +++ b/7
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+7 +7
3: [mq]: 7.patch - john - 13.00 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew ==== qnew
adding 8 adding 8
diff -r ... 8 diff -r ... 8
--- /dev/null --- /dev/null
+++ b/8 +++ b/8
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+8 +8
4: [mq]: 8.patch - test 4: 868b62f09492 [mq]: 8.patch - test
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u -d ==== qref -u -d
From: john From: john
Date: 14 0 Date: 14 0
diff -r ... 8 diff -r ... 8
--- /dev/null --- /dev/null
+++ b/8 +++ b/8
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+8 +8
4: [mq]: 8.patch - john 4: b1e878ae55b9 [mq]: 8.patch - john
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 8.patch popping 8.patch
now at: 7.patch now at: 7.patch
==== qnew -m ==== qnew -m
adding 9 adding 9
Nine Nine
diff -r ... 9 diff -r ... 9
--- /dev/null --- /dev/null
+++ b/9 +++ b/9
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+9 +9
4: Nine - test 4: 7251936ac2bf Nine - test
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u -d ==== qref -u -d
From: john From: john
Date: 15 0 Date: 15 0
Nine Nine
diff -r ... 9 diff -r ... 9
--- /dev/null --- /dev/null
+++ b/9 +++ b/9
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+9 +9
4: Nine - john 4: a0de5bf6e9f7 Nine - john
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 9.patch popping 9.patch
now at: 7.patch now at: 7.patch
==== qpop -a / qpush -a ==== qpop -a / qpush -a
popping 7.patch popping 7.patch
popping 5.patch popping 5.patch
popping 3.patch popping 3.patch
popping 1.patch popping 1.patch
patch queue now empty patch queue now empty
applying 1.patch applying 1.patch
applying 3.patch applying 3.patch
applying 5.patch applying 5.patch
applying 7.patch applying 7.patch
now at: 7.patch now at: 7.patch
3: imported patch 7.patch - john - 13.00 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
2: imported patch 5.patch - test - 11.00 2: dda6cf77060a imported patch 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: 25e32d66c8c7 Three (again) - test - 8.00
0: imported patch 1.patch - test - 4.00 0: e5011c0211fe imported patch 1.patch - test - 4.00
$ rm -r sandbox $ rm -r sandbox
======= hg headers ======= hg headers
$ echo "plain=false" >> $HGRCPATH $ echo "plain=false" >> $HGRCPATH
$ mkdir sandbox $ mkdir sandbox
$ (cd sandbox ; runtest) $ (cd sandbox ; runtest)
==== init ==== init
==== qnew -d ==== qnew -d
# HG changeset patch # HG changeset patch
# Date 3 0 # Date 3 0
# Parent # Parent
0: [mq]: 1.patch - test - 3.00 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
==== qref ==== qref
adding 1 adding 1
# HG changeset patch # HG changeset patch
# Date 3 0 # Date 3 0
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test - 3.00 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
==== qref -d ==== qref -d
# HG changeset patch # HG changeset patch
# Date 4 0 # Date 4 0
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew ==== qnew
adding 2 adding 2
# HG changeset patch # HG changeset patch
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: fc7e8a2f6499 [mq]: 2.patch - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
# HG changeset patch # HG changeset patch
# Date 5 0 # Date 5 0
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: 1d9a6a118fd1 [mq]: 2.patch - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 2.patch popping 2.patch
now at: 1.patch now at: 1.patch
==== qnew -d -m ==== qnew -d -m
# HG changeset patch # HG changeset patch
# Date 6 0 # Date 6 0
# Parent # Parent
Three Three
1: Three - test - 6.00 1: 2a9ef0bdefba Three - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref ==== qref
adding 3 adding 3
# HG changeset patch # HG changeset patch
# Date 6 0 # Date 6 0
# Parent # Parent
Three Three
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Three - test - 6.00 1: 7f19ad9eea7b Three - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -m ==== qref -m
# HG changeset patch # HG changeset patch
# Date 6 0 # Date 6 0
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Drei - test - 6.00 1: 7ff7377793e3 Drei - test - 6.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -d ==== qref -d
# HG changeset patch # HG changeset patch
# Date 7 0 # Date 7 0
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Drei - test - 7.00 1: d89d3144f518 Drei - test - 7.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qref -d -m ==== qref -d -m
# HG changeset patch # HG changeset patch
# Date 8 0 # Date 8 0
# Parent # Parent
Three (again) Three (again)
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew -m ==== qnew -m
adding 4 adding 4
# HG changeset patch # HG changeset patch
# Parent # Parent
Four Four
diff -r ... 4 diff -r ... 4
--- /dev/null --- /dev/null
+++ b/4 +++ b/4
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 +4
2: Four - test 2: 74ded07d166b Four - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
# HG changeset patch # HG changeset patch
# Date 9 0 # Date 9 0
# Parent # Parent
Four Four
diff -r ... 4 diff -r ... 4
--- /dev/null --- /dev/null
+++ b/4 +++ b/4
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 +4
2: Four - test 2: 1a651320cf8e Four - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 4.patch popping 4.patch
now at: 3.patch now at: 3.patch
==== qnew with HG header ==== qnew with HG header
popping 5.patch popping 5.patch
now at: 3.patch now at: 3.patch
# HG changeset patch # HG changeset patch
# Date 10 0 # Date 10 0
2: imported patch 5.patch - test - 10.00 2: d16a272220d2 imported patch 5.patch - test - 10.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref ==== hg qref
adding 5 adding 5
# HG changeset patch # HG changeset patch
# Date 10 0 # Date 10 0
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
2: [mq]: 5.patch - test - 10.00 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref -d ==== hg qref -d
# HG changeset patch # HG changeset patch
# Date 11 0 # Date 11 0
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew with plain header ==== qnew with plain header
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
now at: 6.patch now at: 6.patch
Date: 12 0 Date: 12 0
3: imported patch 6.patch - test 3: 8ad9ebc22b96 imported patch 6.patch - test
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== hg qref ==== hg qref
adding 6 adding 6
Date: 12 0 Date: 12 0
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - test - 12.00 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== hg qref -d ==== hg qref -d
Date: 13 0 Date: 13 0
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - test - 13.00 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
==== qnew -u ==== qnew -u
adding 6 adding 6
# HG changeset patch # HG changeset patch
# User jane # User jane
# Parent # Parent
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - jane 3: a05a33f187ce [mq]: 6.patch - jane
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -d ==== qref -d
# HG changeset patch # HG changeset patch
# User jane # User jane
# Date 12 0 # Date 12 0
# Parent # Parent
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
3: [mq]: 6.patch - jane 3: 5702c529dfe9 [mq]: 6.patch - jane
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
==== qnew -d ==== qnew -d
adding 7 adding 7
# HG changeset patch # HG changeset patch
# Date 13 0 # Date 13 0
# Parent # Parent
diff -r ... 7 diff -r ... 7
--- /dev/null --- /dev/null
+++ b/7 +++ b/7
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+7 +7
3: [mq]: 7.patch - test 3: 8dd1eb8d4132 [mq]: 7.patch - test
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User john # User john
# Date 13 0 # Date 13 0
# Parent # Parent
diff -r ... 7 diff -r ... 7
--- /dev/null --- /dev/null
+++ b/7 +++ b/7
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+7 +7
3: [mq]: 7.patch - john - 13.00 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
2: [mq]: 5.patch - test - 11.00 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: b1b6b0fe0e6d Three (again) - test - 8.00
0: [mq]: 1.patch - test - 4.00 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
==== qnew ==== qnew
adding 8 adding 8
# HG changeset patch # HG changeset patch
# Parent # Parent
diff -r ... 8 diff -r ... 8
--- /dev/null --- /dev/null
+++ b/8 +++ b/8
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+8 +8
4: [mq]: 8.patch - test 4: 868b62f09492 [mq]: 8.patch - test
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u -d ==== qref -u -d
# HG changeset patch # HG changeset patch
# User john # User john
# Date 14 0 # Date 14 0
# Parent # Parent
diff -r ... 8 diff -r ... 8
--- /dev/null --- /dev/null
+++ b/8 +++ b/8
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+8 +8
4: [mq]: 8.patch - john 4: b1e878ae55b9 [mq]: 8.patch - john
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 8.patch popping 8.patch
now at: 7.patch now at: 7.patch
==== qnew -m ==== qnew -m
adding 9 adding 9
# HG changeset patch # HG changeset patch
# Parent # Parent
Nine Nine
diff -r ... 9 diff -r ... 9
--- /dev/null --- /dev/null
+++ b/9 +++ b/9
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+9 +9
4: Nine - test 4: 7251936ac2bf Nine - test
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
==== qref -u -d ==== qref -u -d
# HG changeset patch # HG changeset patch
# User john # User john
# Date 15 0 # Date 15 0
# Parent # Parent
Nine Nine
diff -r ... 9 diff -r ... 9
--- /dev/null --- /dev/null
+++ b/9 +++ b/9
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+9 +9
4: Nine - john 4: a0de5bf6e9f7 Nine - john
3: [mq]: 7.patch - john 3: 4f9d07369cc4 [mq]: 7.patch - john
2: [mq]: 5.patch - test 2: 049de6af0c1d [mq]: 5.patch - test
1: Three (again) - test 1: b1b6b0fe0e6d Three (again) - test
0: [mq]: 1.patch - test 0: 4a67dfeea974 [mq]: 1.patch - test
popping 9.patch popping 9.patch
now at: 7.patch now at: 7.patch
==== qpop -a / qpush -a ==== qpop -a / qpush -a
popping 7.patch popping 7.patch
popping 5.patch popping 5.patch
popping 3.patch popping 3.patch
popping 1.patch popping 1.patch
patch queue now empty patch queue now empty
applying 1.patch applying 1.patch
applying 3.patch applying 3.patch
applying 5.patch applying 5.patch
applying 7.patch applying 7.patch
now at: 7.patch now at: 7.patch
3: imported patch 7.patch - john - 13.00 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
2: imported patch 5.patch - test - 11.00 2: dda6cf77060a imported patch 5.patch - test - 11.00
1: Three (again) - test - 8.00 1: 25e32d66c8c7 Three (again) - test - 8.00
0: imported patch 1.patch - test - 4.00 0: e5011c0211fe imported patch 1.patch - test - 4.00
$ rm -r sandbox $ rm -r sandbox

tests/test-mq-header-from.t

$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH
$ echo "[diff]" >> $HGRCPATH $ echo "[diff]" >> $HGRCPATH
$ echo "nodates=true" >> $HGRCPATH $ echo "nodates=true" >> $HGRCPATH
$ catlog() { $ catlog() {
> cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
> -e "s/^\(# Parent \).*/\1/" > -e "s/^\(# Parent \).*/\1/"
> hg log --template "{rev}: {desc} - {author}\n" > hg log --template "{rev}: {node|short} {desc} - {author}\n"
> } > }
$ runtest() { $ runtest() {
> echo ==== init > echo ==== init
> hg init a > hg init a
> cd a > cd a
> hg qinit > hg qinit
> >
> >
> echo ==== hg qref -u > echo ==== hg qref -u
> hg qref -u johndeere > hg qref -u johndeere
> catlog 6 > catlog 6
> >
> >
> echo ==== "qpop -a / qpush -a" > echo ==== "qpop -a / qpush -a"
> hg qpop -a > hg qpop -a
> hg qpush -a > hg qpush -a
> hg log --template "{rev}: {desc} - {author}\n" > hg log --template "{rev}: {node|short} {desc} - {author}\n"
> } > }
======= plain headers ======= plain headers
$ echo "[mq]" >> $HGRCPATH $ echo "[mq]" >> $HGRCPATH
$ echo "plain=true" >> $HGRCPATH $ echo "plain=true" >> $HGRCPATH
$ mkdir sandbox $ mkdir sandbox
$ (cd sandbox ; runtest) $ (cd sandbox ; runtest)
==== init ==== init
==== qnew -U ==== qnew -U
From: test From: test
0: [mq]: 1.patch - test 0: a054644889e5 [mq]: 1.patch - test
==== qref ==== qref
adding 1 adding 1
From: test From: test
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test 0: 2905f1e46ee0 [mq]: 1.patch - test
==== qref -u ==== qref -u
From: mary From: mary
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew ==== qnew
adding 2 adding 2
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: 527f98a12a7a [mq]: 2.patch - test
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
From: jane From: jane
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -U -m ==== qnew -U -m
From: test From: test
Three Three
2: Three - test 2: 0ffa16a9088e Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref ==== qref
adding 3 adding 3
From: test From: test
Three Three
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three - test 2: 83f1290c6086 Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -m ==== qref -m
From: test From: test
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - test 2: b0d856328d4d Drei - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
From: mary From: mary
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - mary 2: bb9d4b28e6a6 Drei - mary
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u -m ==== qref -u -m
From: maria From: maria
Three (again) Three (again)
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -m ==== qnew -m
adding 4of adding 4of
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - test 3: b9f922d0da40 Four - test
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
From: jane From: jane
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with HG header ==== qnew with HG header
popping 5.patch popping 5.patch
now at: 4.patch now at: 4.patch
now at: 5.patch now at: 5.patch
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
4: imported patch 5.patch - johndoe 4: 72bc4a0467ef imported patch 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 5 adding 5
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndoe 4: ff5c06112e5a [mq]: 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - test 4: c947416c22b1 [mq]: 5.patch - test
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
# HG changeset patch # HG changeset patch
# User johndeere # User johndeere
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with plain header ==== qnew with plain header
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
now at: 6.patch now at: 6.patch
From: test From: test
5: imported patch 6.patch - test 5: 7825a18ec839 imported patch 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 6 adding 6
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
From: johndeere From: johndeere
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - johndeere 5: 32641ee07196 [mq]: 6.patch - johndeere
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qpop -a / qpush -a ==== qpop -a / qpush -a
popping 6.patch popping 6.patch
popping 5.patch popping 5.patch
popping 4.patch popping 4.patch
popping 3.patch popping 3.patch
popping 2.patch popping 2.patch
popping 1.patch popping 1.patch
patch queue now empty patch queue now empty
applying 1.patch applying 1.patch
applying 2.patch applying 2.patch
applying 3.patch applying 3.patch
applying 4.patch applying 4.patch
applying 5.patch applying 5.patch
applying 6.patch applying 6.patch
now at: 6.patch now at: 6.patch
5: imported patch 6.patch - johndeere 5: 1fb083c80457 imported patch 6.patch - johndeere
4: imported patch 5.patch - johndeere 4: 7e96e969691d imported patch 5.patch - johndeere
3: Four - jane 3: c7147533d3cd Four - jane
2: Three (again) - maria 2: b383d04401ea Three (again) - maria
1: imported patch 2.patch - jane 1: fac2da4efc3c imported patch 2.patch - jane
0: imported patch 1.patch - mary 0: b6e237e8771b imported patch 1.patch - mary
$ rm -r sandbox $ rm -r sandbox
======= hg headers ======= hg headers
$ echo "plain=false" >> $HGRCPATH $ echo "plain=false" >> $HGRCPATH
$ mkdir sandbox $ mkdir sandbox
$ (cd sandbox ; runtest) $ (cd sandbox ; runtest)
==== init ==== init
==== qnew -U ==== qnew -U
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
0: [mq]: 1.patch - test 0: a054644889e5 [mq]: 1.patch - test
==== qref ==== qref
adding 1 adding 1
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test 0: 2905f1e46ee0 [mq]: 1.patch - test
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User mary # User mary
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew ==== qnew
adding 2 adding 2
# HG changeset patch # HG changeset patch
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: 527f98a12a7a [mq]: 2.patch - test
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User jane # User jane
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -U -m ==== qnew -U -m
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Three Three
2: Three - test 2: 0ffa16a9088e Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref ==== qref
adding 3 adding 3
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Three Three
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three - test 2: 83f1290c6086 Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -m ==== qref -m
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - test 2: b0d856328d4d Drei - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User mary # User mary
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - mary 2: bb9d4b28e6a6 Drei - mary
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u -m ==== qref -u -m
# HG changeset patch # HG changeset patch
# User maria # User maria
# Parent # Parent
Three (again) Three (again)
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -m ==== qnew -m
adding 4of adding 4of
# HG changeset patch # HG changeset patch
# Parent # Parent
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - test 3: b9f922d0da40 Four - test
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User jane # User jane
# Parent # Parent
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with HG header ==== qnew with HG header
popping 5.patch popping 5.patch
now at: 4.patch now at: 4.patch
now at: 5.patch now at: 5.patch
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
4: imported patch 5.patch - johndoe 4: 72bc4a0467ef imported patch 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 5 adding 5
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndoe 4: ff5c06112e5a [mq]: 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - test 4: c947416c22b1 [mq]: 5.patch - test
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
# HG changeset patch # HG changeset patch
# User johndeere # User johndeere
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with plain header ==== qnew with plain header
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
now at: 6.patch now at: 6.patch
From: test From: test
5: imported patch 6.patch - test 5: 7825a18ec839 imported patch 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 6 adding 6
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
From: johndeere From: johndeere
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - johndeere 5: 32641ee07196 [mq]: 6.patch - johndeere
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qpop -a / qpush -a ==== qpop -a / qpush -a
popping 6.patch popping 6.patch
popping 5.patch popping 5.patch
popping 4.patch popping 4.patch
popping 3.patch popping 3.patch
popping 2.patch popping 2.patch
popping 1.patch popping 1.patch
patch queue now empty patch queue now empty
applying 1.patch applying 1.patch
applying 2.patch applying 2.patch
applying 3.patch applying 3.patch
applying 4.patch applying 4.patch
applying 5.patch applying 5.patch
applying 6.patch applying 6.patch
now at: 6.patch now at: 6.patch
5: imported patch 6.patch - johndeere 5: 1fb083c80457 imported patch 6.patch - johndeere
4: imported patch 5.patch - johndeere 4: 7e96e969691d imported patch 5.patch - johndeere
3: Four - jane 3: c7147533d3cd Four - jane
2: Three (again) - maria 2: b383d04401ea Three (again) - maria
1: imported patch 2.patch - jane 1: fac2da4efc3c imported patch 2.patch - jane
0: imported patch 1.patch - mary 0: b6e237e8771b imported patch 1.patch - mary
$ rm -r sandbox $ rm -r sandbox
$ runtest $ runtest
==== init ==== init
==== qnew -U ==== qnew -U
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
0: [mq]: 1.patch - test 0: a054644889e5 [mq]: 1.patch - test
==== qref ==== qref
adding 1 adding 1
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - test 0: 2905f1e46ee0 [mq]: 1.patch - test
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User mary # User mary
# Parent # Parent
diff -r ... 1 diff -r ... 1
--- /dev/null --- /dev/null
+++ b/1 +++ b/1
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+1 +1
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew ==== qnew
adding 2 adding 2
# HG changeset patch # HG changeset patch
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - test 1: 527f98a12a7a [mq]: 2.patch - test
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User jane # User jane
# Parent # Parent
diff -r ... 2 diff -r ... 2
--- /dev/null --- /dev/null
+++ b/2 +++ b/2
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+2 +2
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -U -m ==== qnew -U -m
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Three Three
2: Three - test 2: 0ffa16a9088e Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref ==== qref
adding 3 adding 3
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Three Three
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three - test 2: 83f1290c6086 Three - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -m ==== qref -m
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - test 2: b0d856328d4d Drei - test
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User mary # User mary
# Parent # Parent
Drei Drei
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Drei - mary 2: bb9d4b28e6a6 Drei - mary
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u -m ==== qref -u -m
# HG changeset patch # HG changeset patch
# User maria # User maria
# Parent # Parent
Three (again) Three (again)
diff -r ... 3 diff -r ... 3
--- /dev/null --- /dev/null
+++ b/3 +++ b/3
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+3 +3
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew -m ==== qnew -m
adding 4of adding 4of
# HG changeset patch # HG changeset patch
# Parent # Parent
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - test 3: b9f922d0da40 Four - test
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qref -u ==== qref -u
# HG changeset patch # HG changeset patch
# User jane # User jane
# Parent # Parent
Four Four
diff -r ... 4of diff -r ... 4of
--- /dev/null --- /dev/null
+++ b/4of +++ b/4of
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+4 t +4 t
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with HG header ==== qnew with HG header
popping 5.patch popping 5.patch
now at: 4.patch now at: 4.patch
now at: 5.patch now at: 5.patch
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
4: imported patch 5.patch - johndoe 4: 72bc4a0467ef imported patch 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 5 adding 5
# HG changeset patch # HG changeset patch
# User johndoe # User johndoe
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndoe 4: ff5c06112e5a [mq]: 5.patch - johndoe
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
# HG changeset patch # HG changeset patch
# User test # User test
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - test 4: c947416c22b1 [mq]: 5.patch - test
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
# HG changeset patch # HG changeset patch
# User johndeere # User johndeere
# Parent # Parent
diff -r ... 5 diff -r ... 5
--- /dev/null --- /dev/null
+++ b/5 +++ b/5
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+5 +5
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qnew with plain header ==== qnew with plain header
popping 6.patch popping 6.patch
now at: 5.patch now at: 5.patch
now at: 6.patch now at: 6.patch
From: test From: test
5: imported patch 6.patch - test 5: 7825a18ec839 imported patch 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref ==== hg qref
adding 6 adding 6
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -U ==== hg qref -U
From: test From: test
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - test 5: 09d19592680d [mq]: 6.patch - test
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== hg qref -u ==== hg qref -u
From: johndeere From: johndeere
diff -r ... 6 diff -r ... 6
--- /dev/null --- /dev/null
+++ b/6 +++ b/6
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+6 +6
5: [mq]: 6.patch - johndeere 5: 32641ee07196 [mq]: 6.patch - johndeere
4: [mq]: 5.patch - johndeere 4: 1d898e201a22 [mq]: 5.patch - johndeere
3: Four - jane 3: 0dfb3111e7ee Four - jane
2: Three (again) - maria 2: a6686ee84fc3 Three (again) - maria
1: [mq]: 2.patch - jane 1: a425cde5f493 [mq]: 2.patch - jane
0: [mq]: 1.patch - mary 0: 3682f830e656 [mq]: 1.patch - mary
==== qpop -a / qpush -a ==== qpop -a / qpush -a
popping 6.patch popping 6.patch
popping 5.patch popping 5.patch
popping 4.patch popping 4.patch
popping 3.patch popping 3.patch
popping 2.patch popping 2.patch
popping 1.patch popping 1.patch
patch queue now empty patch queue now empty
applying 1.patch applying 1.patch
applying 2.patch applying 2.patch
applying 3.patch applying 3.patch
applying 4.patch applying 4.patch
applying 5.patch applying 5.patch
applying 6.patch applying 6.patch
now at: 6.patch now at: 6.patch
5: imported patch 6.patch - johndeere 5: 1fb083c80457 imported patch 6.patch - johndeere
4: imported patch 5.patch - johndeere 4: 7e96e969691d imported patch 5.patch - johndeere
3: Four - jane 3: c7147533d3cd Four - jane
2: Three (again) - maria 2: b383d04401ea Three (again) - maria
1: imported patch 2.patch - jane 1: fac2da4efc3c imported patch 2.patch - jane
0: imported patch 1.patch - mary 0: b6e237e8771b imported patch 1.patch - mary
$ cd .. $ cd ..

tests/test-mq-pull-from-bundle.t

$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq= > mq=
> [alias] > [alias]
> tlog = log --template "{rev}: {desc}\\n" > tlog = log --template "{rev}: {node|short} {desc}\\n"
> theads = heads --template "{rev}: {desc}\\n" > theads = heads --template "{rev}: {desc}\\n"
> tincoming = incoming --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n"
> EOF > EOF
Setup main: Setup main:
$ hg init base $ hg init base
$ cd base $ cd base
merging series merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true
$ hg -R .hg/patches theads $ hg -R .hg/patches theads
0: queue: two.patch added 0: queue: two.patch added
$ hg -R .hg/patches tlog $ hg -R .hg/patches tlog
0: queue: two.patch added 0: d7553909353d queue: two.patch added
$ hg qseries $ hg qseries
two.patch two.patch
$ cd .. $ cd ..
Clone base again: Clone base again:
new changesets d7553909353d new changesets d7553909353d
merging series merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg -R .hg/patches theads $ hg -R .hg/patches theads
0: queue: two.patch added 0: queue: two.patch added
$ hg -R .hg/patches tlog $ hg -R .hg/patches tlog
0: queue: two.patch added 0: d7553909353d queue: two.patch added
$ hg qseries $ hg qseries
two.patch two.patch
$ cd .. $ cd ..

tests/test-rebase-base-flag.t

Test the "--base" flag of the rebase command. (Tests unrelated to the "--base" Test the "--base" flag of the rebase command. (Tests unrelated to the "--base"
flag should probably live in somewhere else) flag should probably live in somewhere else)
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: {desc}" > tglog = log -G --template "{rev}: {node|short} {desc}"
> EOF > EOF
$ rebasewithdag() { $ rebasewithdag() {
> N=`$PYTHON -c "print($N+1)"` > N=`$PYTHON -c "print($N+1)"`
> hg init repo$N && cd repo$N > hg init repo$N && cd repo$N
> hg debugdrawdag > hg debugdrawdag
> hg rebase "$@" > _rebasetmp > hg rebase "$@" > _rebasetmp
> r=$? > r=$?
> \|/ # B should not be picked > \|/ # B should not be picked
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:4526cf523425 "D" (D) rebasing 5:4526cf523425 "D" (D)
rebasing 6:b296604d9846 "E" (E tip) rebasing 6:b296604d9846 "E" (E tip)
o 6: E o 6: 4870f5e7df37 E
| |
| o 5: D | o 5: dc999528138a D
|/ |/
o 4: C o 4: 6b3e11729672 C
| |
o 3: Z o 3: 57e70bad1ea3 Z
| |
| o 2: B | o 2: c1e6b162678d B
|/ |/
o 1: A o 1: 21a6c4502885 A
| |
o 0: R o 0: b41ce7760717 R
Multiple branching points caused by selecting a single merge changeset: Multiple branching points caused by selecting a single merge changeset:
$ rebasewithdag -b E -d Z <<'EOS' $ rebasewithdag -b E -d Z <<'EOS'
> E > E
> /| > /|
> B C D # B, C: multiple branching points > B C D # B, C: multiple branching points
> | |/ # D should not be picked > | |/ # D should not be picked
> Z | / > Z | /
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 6:54c8f00cb91c "E" (E tip) rebasing 6:54c8f00cb91c "E" (E tip)
o 6: E o 6: 00598421b616 E
|\ |\
| o 5: C | o 5: 6b3e11729672 C
| | | |
o | 4: B o | 4: 85260910e847 B
|/ |/
o 3: Z o 3: 57e70bad1ea3 Z
| |
| o 2: D | o 2: 8924700906fe D
|/ |/
o 1: A o 1: 21a6c4502885 A
| |
o 0: R o 0: b41ce7760717 R
Rebase should not extend the "--base" revset using "descendants": Rebase should not extend the "--base" revset using "descendants":
$ rebasewithdag -b B -d Z <<'EOS' $ rebasewithdag -b B -d Z <<'EOS'
> E > E
> /| > /|
> Z B C # descendants(B) = B+E. With E, C will be included incorrectly > Z B C # descendants(B) = B+E. With E, C will be included incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 5:54c8f00cb91c "E" (E tip)
o 5: E o 5: e583bf3ff54c E
|\ |\
| o 4: B | o 4: 85260910e847 B
| | | |
| o 3: Z | o 3: 57e70bad1ea3 Z
| | | |
o | 2: C o | 2: d6003a550c2c C
|/ |/
o 1: A o 1: 21a6c4502885 A
| |
o 0: R o 0: b41ce7760717 R
Rebase should not simplify the "--base" revset using "roots": Rebase should not simplify the "--base" revset using "roots":
$ rebasewithdag -b B+E -d Z <<'EOS' $ rebasewithdag -b B+E -d Z <<'EOS'
> E > E
> /| > /|
> Z B C # roots(B+E) = B. Without E, C will be missed incorrectly > Z B C # roots(B+E) = B. Without E, C will be missed incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 5:54c8f00cb91c "E" (E tip)
o 5: E o 5: 00598421b616 E
|\ |\
| o 4: C | o 4: 6b3e11729672 C
| | | |
o | 3: B o | 3: 85260910e847 B
|/ |/
o 2: Z o 2: 57e70bad1ea3 Z
| |
o 1: A o 1: 21a6c4502885 A
| |
o 0: R o 0: b41ce7760717 R
The destination is one of the two branching points of a merge: The destination is one of the two branching points of a merge:
$ rebasewithdag -b F -d Z <<'EOS' $ rebasewithdag -b F -d Z <<'EOS'
> F > F
> / \ > / \
> E D > E D
> / / > / /
> R > R
> EOS > EOS
rebasing 3:a113dbaa660a "B1" (B1) rebasing 3:a113dbaa660a "B1" (B1)
rebasing 5:06ce7b1cc8c2 "B2" (B2) rebasing 5:06ce7b1cc8c2 "B2" (B2)
rebasing 6:0ac98cce32d3 "C1" (C1) rebasing 6:0ac98cce32d3 "C1" (C1)
rebasing 8:781512f5e33d "C2" (C2) rebasing 8:781512f5e33d "C2" (C2)
rebasing 9:428d8c18f641 "E1" (E1) rebasing 9:428d8c18f641 "E1" (E1)
rebasing 11:e1bf82f6b6df "E2" (E2) rebasing 11:e1bf82f6b6df "E2" (E2)
o 12: E2 o 12: e4a37b6fdbd2 E2
| |
o 11: E1 o 11: 9675bea983df E1
| |
| o 10: C2 | o 10: 4faf5d4c80dc C2
| | | |
| o 9: C1 | o 9: d4799b1ad57d C1
|/ |/
| o 8: B2 | o 8: 772732dc64d6 B2
| | | |
| o 7: B1 | o 7: ad3ac528a49f B1
|/ |/
o 6: Z o 6: 2cbdfca6b9d5 Z
| |
o 5: F o 5: fcdb3293ec13 F
| |
o 4: E o 4: a4652bb8ac54 E
| |
o 3: C o 3: bd5548558fcf C
| |
o 2: B o 2: c1e6b162678d B
| |
o 1: A o 1: 21a6c4502885 A
| |
o 0: R o 0: b41ce7760717 R
Multiple branching points with multiple merges: Multiple branching points with multiple merges:
$ rebasewithdag -b G+P -d Z <<'EOS' $ rebasewithdag -b G+P -d Z <<'EOS'
> G H P > G H P
> |\ /| |\ > |\ /| |\
> F E D M N > F E D M N
> \|/| /| |\ > \|/| /| |\
rebasing 14:2893b886bb10 "H" (H) rebasing 14:2893b886bb10 "H" (H)
rebasing 3:08ebfeb61bac "I" (I) rebasing 3:08ebfeb61bac "I" (I)
rebasing 4:a0a5005cec67 "J" (J) rebasing 4:a0a5005cec67 "J" (J)
rebasing 5:83780307a7e8 "K" (K) rebasing 5:83780307a7e8 "K" (K)
rebasing 6:e131637a1cb6 "L" (L) rebasing 6:e131637a1cb6 "L" (L)
rebasing 11:d1f6d0c3c7e4 "M" (M) rebasing 11:d1f6d0c3c7e4 "M" (M)
rebasing 12:7aaec6f81888 "N" (N) rebasing 12:7aaec6f81888 "N" (N)
rebasing 15:325bc8f1760d "P" (P tip) rebasing 15:325bc8f1760d "P" (P tip)
o 15: P o 15: 6ef6a0ea3b18 P
|\ |\
| o 14: N | o 14: 20ba3610a7e5 N
| |\ | |\
o \ \ 13: M o \ \ 13: cd4f6c06d2ab M
|\ \ \ |\ \ \
| | | o 12: L | | | o 12: bca872041455 L
| | | | | | | |
| | o | 11: K | | o | 11: 7bbb6c8a6ad7 K
| | |/ | | |/
| o / 10: J | o / 10: de0cbffe893e J
| |/ | |/
o / 9: I o / 9: 0e710f176a88 I
|/ |/
| o 8: H | o 8: 52507bab39ca H
| |\ | |\
| | | o 7: G | | | o 7: bb5fe4652f0d G
| | |/| | | |/|
| | | o 6: F | | | o 6: f4ad4b31daf4 F
| | | | | | | |
| | o | 5: E | | o | 5: b168f85f2e78 E
| | |/ | | |/
| o | 4: D | o | 4: 8d09fcdb5594 D
| |\| | |\|
+---o 3: C +---o 3: ab70b4c5a9c9 C
| | | |
o | 2: Z o | 2: 262e37e34f63 Z
| | | |
| o 1: B | o 1: 112478962961 B
|/ |/
o 0: A o 0: 426bada5c675 A
Slightly more complex merge case (mentioned in https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-November/091074.html): Slightly more complex merge case (mentioned in https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-November/091074.html):
$ rebasewithdag -b A3+B3 -d Z <<'EOF' $ rebasewithdag -b A3+B3 -d Z <<'EOF'
> Z C1 A3 B3 > Z C1 A3 B3
> | / / \ / \ > | / / \ / \
> M3 C0 A1 A2 B1 B2 > M3 C0 A1 A2 B1 B2
> | / | | | | > | / | | | |
> M2 M1 C1 C1 M3 > M2 M1 C1 C1 M3
> | > |
> M1 > M1
> | > |
> M0 > M0
> EOF > EOF
rebasing 4:8817fae53c94 "C0" (C0) rebasing 4:8817fae53c94 "C0" (C0)
rebasing 6:06ca5dfe3b5b "B2" (B2) rebasing 6:06ca5dfe3b5b "B2" (B2)
rebasing 7:73508237b032 "C1" (C1) rebasing 7:73508237b032 "C1" (C1)
rebasing 9:fdb955e2faed "A2" (A2) rebasing 9:fdb955e2faed "A2" (A2)
rebasing 11:4e449bd1a643 "A3" (A3) rebasing 11:4e449bd1a643 "A3" (A3)
rebasing 10:0a33b0519128 "B1" (B1) rebasing 10:0a33b0519128 "B1" (B1)
rebasing 12:209327807c3a "B3" (B3 tip) rebasing 12:209327807c3a "B3" (B3 tip)
o 12: B3 o 12: ceb984566332 B3
|\ |\
| o 11: B1 | o 11: 19d93caac497 B1
| | | |
| | o 10: A3 | | o 10: 058e73d3916b A3
| | |\ | | |\
| +---o 9: A2 | +---o 9: 0ba13ad72234 A2
| | | | | |
| o | 8: C1 | o | 8: c122c2af10c6 C1
| | | | | |
o | | 7: B2 o | | 7: 74275896650e B2
| | | | | |
| o | 6: C0 | o | 6: 455ba9bd3ea2 C0
|/ / |/ /
o | 5: Z o | 5: b3d7d2fda53b Z
| | | |
o | 4: M3 o | 4: 182ab6383dd7 M3
| | | |
o | 3: M2 o | 3: 6c3f73563d5f M2
| | | |
| o 2: A1 | o 2: 88c860fffcc2 A1
|/ |/
o 1: M1 o 1: bc852baa85dd M1
| |
o 0: M0 o 0: dbdfc5c9bcd5 M0
Disconnected graph: Disconnected graph:
$ rebasewithdag -b B -d Z <<'EOS' $ rebasewithdag -b B -d Z <<'EOS'
> B > B
> | > |
> Z A > Z A
> EOS > EOS
nothing to rebase from 112478962961 to 48b9aae0607f nothing to rebase from 112478962961 to 48b9aae0607f
[1] [1]
Multiple roots. Roots are ancestors of dest: Multiple roots. Roots are ancestors of dest:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> D Z B > D Z B
> \|\| > \|\|
> C A > C A
> EOF > EOF
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 "B" (B)
rebasing 3:b70f76719894 "D" (D) rebasing 3:b70f76719894 "D" (D)
o 4: D o 4: 511efad7bf13 D
| |
| o 3: B | o 3: 25c4e279af62 B
|/ |/
o 2: Z o 2: 3a49f54d7bb1 Z
|\ |\
| o 1: C | o 1: 96cc3511f894 C
| |
o 0: A o 0: 426bada5c675 A
Multiple roots. One root is not an ancestor of dest: Multiple roots. One root is not an ancestor of dest:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
nothing to rebase from f675d5a1c6a4+b70f76719894 to 262e37e34f63 nothing to rebase from f675d5a1c6a4+b70f76719894 to 262e37e34f63
[1] [1]
Multiple roots. One root is not an ancestor of dest. Select using a merge: Multiple roots. One root is not an ancestor of dest. Select using a merge:
$ rebasewithdag -b E -d Z <<'EOF' $ rebasewithdag -b E -d Z <<'EOF'
> E > E
> |\ > |\
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
rebasing 2:f675d5a1c6a4 "B" (B) rebasing 2:f675d5a1c6a4 "B" (B)
rebasing 5:f68696fe6af8 "E" (E tip) rebasing 5:f68696fe6af8 "E" (E tip)
o 5: E o 5: f6e6f5081554 E
|\ |\
| o 4: B | o 4: 30cabcba27be B
| |\ | |\
| | o 3: Z | | o 3: 262e37e34f63 Z
| | | | | |
o | | 2: D o | | 2: b70f76719894 D
|/ / |/ /
o / 1: C o / 1: 96cc3511f894 C
/ /
o 0: A o 0: 426bada5c675 A
Multiple roots. Two children share two parents while dest has only one parent: Multiple roots. Two children share two parents while dest has only one parent:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> Z B D > Z B D
> \|\|\ > \|\|\
> A C A > A C A
> EOF > EOF
rebasing 2:f675d5a1c6a4 "B" (B) rebasing 2:f675d5a1c6a4 "B" (B)
rebasing 3:c2a779e13b56 "D" (D) rebasing 3:c2a779e13b56 "D" (D)
o 4: D o 4: 5eecd056b5f8 D
|\ |\
+---o 3: B +---o 3: 30cabcba27be B
| |/ | |/
| o 2: Z | o 2: 262e37e34f63 Z
| | | |
o | 1: C o | 1: 96cc3511f894 C
/ /
o 0: A o 0: 426bada5c675 A

tests/test-rebase-bookmarks.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
> EOF > EOF
Create a repo with several bookmarks Create a repo with several bookmarks
$ hg init a $ hg init a
$ cd a $ cd a
$ echo a > a $ echo a > a
$ hg ci -Am A $ hg ci -Am A
$ echo d > d $ echo d > d
$ hg ci -Am D $ hg ci -Am D
adding d adding d
created new head created new head
$ hg book W $ hg book W
$ hg tglog $ hg tglog
@ 3: 'D' bookmarks: W @ 3: 41acb9dca9eb 'D' bookmarks: W
| |
| o 2: 'C' bookmarks: Y Z | o 2: 49cb3485fa0c 'C' bookmarks: Y Z
| | | |
| o 1: 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
Move only rebased bookmarks Move only rebased bookmarks
$ cd .. $ cd ..
$ hg clone -q a a1 $ hg clone -q a a1
$ cd a1 $ cd a1
$ hg up -q Z $ hg up -q Z
Test deleting divergent bookmarks from dest (issue3685) Test deleting divergent bookmarks from dest (issue3685)
$ hg book -r 3 Z@diverge $ hg book -r 3 Z@diverge
... and also test that bookmarks not on dest or not being moved aren't deleted ... and also test that bookmarks not on dest or not being moved aren't deleted
$ hg book -r 3 X@diverge $ hg book -r 3 X@diverge
$ hg book -r 0 Y@diverge $ hg book -r 0 Y@diverge
$ hg tglog $ hg tglog
o 3: 'D' bookmarks: W X@diverge Z@diverge o 3: 41acb9dca9eb 'D' bookmarks: W X@diverge Z@diverge
| |
| @ 2: 'C' bookmarks: Y Z | @ 2: 49cb3485fa0c 'C' bookmarks: Y Z
| | | |
| o 1: 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 'A' bookmarks: Y@diverge o 0: 1994f17a630e 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3 $ hg rebase -s Y -d 3
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'C' bookmarks: Y Z @ 3: 17fb3faba63c 'C' bookmarks: Y Z
| |
o 2: 'D' bookmarks: W X@diverge o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge
| |
| o 1: 'B' bookmarks: X | o 1: 6c81ed0049f8 'B' bookmarks: X
|/ |/
o 0: 'A' bookmarks: Y@diverge o 0: 1994f17a630e 'A' bookmarks: Y@diverge
Do not try to keep active but deleted divergent bookmark Do not try to keep active but deleted divergent bookmark
$ cd .. $ cd ..
$ hg clone -q a a4 $ hg clone -q a a4
$ cd a4 $ cd a4
$ hg up -q 2 $ hg up -q 2
$ hg up -q Z $ hg up -q Z
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
rebasing 1:6c81ed0049f8 "B" (X) rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'C' bookmarks: Y Z @ 3: 3d5fa227f4b5 'C' bookmarks: Y Z
| |
o 2: 'B' bookmarks: X o 2: e926fccfa8ec 'B' bookmarks: X
| |
o 1: 'D' bookmarks: W o 1: 41acb9dca9eb 'D' bookmarks: W
| |
o 0: 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
Keep active bookmark on the correct changeset Keep active bookmark on the correct changeset
$ cd .. $ cd ..
$ hg clone -q a a3 $ hg clone -q a a3
$ cd a3 $ cd a3
$ hg up -q X $ hg up -q X
$ hg rebase -d W $ hg rebase -d W
rebasing 1:6c81ed0049f8 "B" (X) rebasing 1:6c81ed0049f8 "B" (X)
rebasing 2:49cb3485fa0c "C" (Y Z) rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
$ hg tglog $ hg tglog
o 3: 'C' bookmarks: Y Z o 3: 3d5fa227f4b5 'C' bookmarks: Y Z
| |
@ 2: 'B' bookmarks: X @ 2: e926fccfa8ec 'B' bookmarks: X
| |
o 1: 'D' bookmarks: W o 1: 41acb9dca9eb 'D' bookmarks: W
| |
o 0: 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
$ hg bookmarks $ hg bookmarks
W 1:41acb9dca9eb W 1:41acb9dca9eb
* X 2:e926fccfa8ec * X 2:e926fccfa8ec
Y 3:3d5fa227f4b5 Y 3:3d5fa227f4b5
Z 3:3d5fa227f4b5 Z 3:3d5fa227f4b5
rebase --continue with bookmarks present (issue3802) rebase --continue with bookmarks present (issue3802)
$ echo 'c' > c $ echo 'c' > c
$ hg resolve --mark c $ hg resolve --mark c
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 3:3d5fa227f4b5 "C" (Y Z) rebasing 3:3d5fa227f4b5 "C" (Y Z)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 4: 'C' bookmarks: Y Z @ 4: 45c0f0ec1203 'C' bookmarks: Y Z
| |
o 3: 'other C' bookmarks: o 3: b0e10b7175fd 'other C' bookmarks:
| |
o 2: 'B' bookmarks: X o 2: e926fccfa8ec 'B' bookmarks: X
| |
o 1: 'D' bookmarks: W o 1: 41acb9dca9eb 'D' bookmarks: W
| |
o 0: 'A' bookmarks: o 0: 1994f17a630e 'A' bookmarks:
ensure that bookmarks given the names of revset functions can be used ensure that bookmarks given the names of revset functions can be used
as --rev arguments (issue3950) as --rev arguments (issue3950)
$ hg update -q 3 $ hg update -q 3
$ echo bimble > bimble $ echo bimble > bimble
$ hg add bimble $ hg add bimble
> B C > B C
> |/ > |/
> A > A
> EOS > EOS
$ eval `hg tags -T 'hg bookmark -ir {node} {tag};\n' | grep -v tip` $ eval `hg tags -T 'hg bookmark -ir {node} {tag};\n' | grep -v tip`
$ rm .hg/localtags $ rm .hg/localtags
$ hg up -q B $ hg up -q B
$ hg tglog $ hg tglog
o 2: 'C' bookmarks: C o 2: dc0947a82db8 'C' bookmarks: C
| |
| @ 1: 'B' bookmarks: B | @ 1: 112478962961 'B' bookmarks: B
|/ |/
o 0: 'A' bookmarks: A o 0: 426bada5c675 'A' bookmarks: A
$ hg rebase -r B -d C --keep $ hg rebase -r B -d C --keep
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
$ hg tglog $ hg tglog
@ 3: 'B' bookmarks: B @ 3: 9769fc65c4c5 'B' bookmarks: B
| |
o 2: 'C' bookmarks: C o 2: dc0947a82db8 'C' bookmarks: C
| |
| o 1: 'B' bookmarks: | o 1: 112478962961 'B' bookmarks:
|/ |/
o 0: 'A' bookmarks: A o 0: 426bada5c675 'A' bookmarks: A

tests/test-rebase-collapse.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> mq= > mq=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
> EOF > EOF
Create repo a: Create repo a:
$ hg init a $ hg init a
$ cd a $ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads) added 8 changesets with 7 changes to 7 files (+2 heads)
new changesets cd010b8cd998:02de42196ebe new changesets cd010b8cd998:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip $ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog $ hg tglog
@ 7: 'H' @ 7: 02de42196ebe 'H'
| |
| o 6: 'G' | o 6: eea13746799a 'G'
|/| |/|
o | 5: 'F' o | 5: 24b6387c8c8c 'F'
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Rebasing B onto H and collapsing changesets with different phases: Rebasing B onto H and collapsing changesets with different phases:
$ hg clone -q -u 3 a a1 $ hg clone -q -u 3 a a1
HG: branch 'default' HG: branch 'default'
HG: added B HG: added B
HG: added C HG: added C
HG: added D HG: added D
==== ====
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglogp $ hg tglogp
@ 5:secret 'Collapsed revision @ 5: 30882080ba93 secret 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| |
| |
| edited manually' | edited manually'
o 4:draft 'H' o 4: 02de42196ebe draft 'H'
| |
| o 3:draft 'G' | o 3: eea13746799a draft 'G'
|/| |/|
o | 2:draft 'F' o | 2: 24b6387c8c8c draft 'F'
| | | |
| o 1:draft 'E' | o 1: 9520eea781bc draft 'E'
|/ |/
o 0:draft 'A' o 0: cd010b8cd998 draft 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
F F
H H
$ cd .. $ cd ..
Rebasing E onto H: Rebasing E onto H:
$ hg clone -q -u . a a2 $ hg clone -q -u . a a2
$ cd a2 $ cd a2
$ hg phase --force --secret 6 $ hg phase --force --secret 6
$ hg rebase --source 4 --collapse --dest 7 $ hg rebase --source 4 --collapse --dest 7
rebasing 4:9520eea781bc "E" rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'Collapsed revision o 6: 7dd333a2d1e4 'Collapsed revision
| * E | * E
| * G' | * G'
@ 5: 'H' @ 5: 02de42196ebe 'H'
| |
o 4: 'F' o 4: 24b6387c8c8c 'F'
| |
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
E E
F F
H H
$ cd .. $ cd ..
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7
rebasing 4:9520eea781bc "E" rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
HGEDITFORM=rebase.collapse HGEDITFORM=rebase.collapse
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'custom message' o 6: 38ed6a6b026b 'custom message'
| |
@ 5: 'H' @ 5: 02de42196ebe 'H'
| |
o 4: 'F' o 4: 24b6387c8c8c 'F'
| |
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
E E
F F
H H
$ cd .. $ cd ..
$ hg up -q 0 $ hg up -q 0
$ echo H > H $ echo H > H
$ hg ci -Am H $ hg ci -Am H
adding H adding H
created new head created new head
$ hg tglog $ hg tglog
@ 7: 'H' @ 7: c65502d41787 'H'
| |
| o 6: 'G' | o 6: c772a8b2dc17 'G'
| |\ | |\
| | o 5: 'F' | | o 5: 7f219660301f 'F'
| | | | | |
| | o 4: 'E' | | o 4: 8a5212ebc852 'E'
| | | | | |
| o | 3: 'D' | o | 3: 2870ad076e54 'D'
| |\| | |\|
| o | 2: 'C' | o | 2: c5cefa58fd55 'C'
|/ / |/ /
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
Rebase and collapse - more than one external (fail): Rebase and collapse - more than one external (fail):
$ hg clone -q -u . b b1 $ hg clone -q -u . b b1
$ cd b1 $ cd b1
$ hg rebase -s 2 --dest 7 --collapse $ hg rebase -s 2 --dest 7 --collapse
abort: unable to collapse on top of 7, there is more than one external parent: 1, 5 abort: unable to collapse on top of 7, there is more than one external parent: 1, 5
[255] [255]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge $ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge
rebasing 4:8a5212ebc852 "E" rebasing 4:8a5212ebc852 "E"
rebasing 5:7f219660301f "F" rebasing 5:7f219660301f "F"
rebasing 6:c772a8b2dc17 "G" rebasing 6:c772a8b2dc17 "G"
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob) saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob)
$ hg tglog $ hg tglog
o 5: 'Collapsed revision o 5: f97c4725bd99 'Collapsed revision
|\ * E |\ * E
| | * F | | * F
| | * G' | | * G'
| @ 4: 'H' | @ 4: c65502d41787 'H'
| | | |
o | 3: 'D' o | 3: 2870ad076e54 'D'
|\ \ |\ \
| o | 2: 'C' | o | 2: c5cefa58fd55 'C'
| |/ | |/
o / 1: 'B' o / 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C C
D D
E E
F F
H H
$ hg up -q 0 $ hg up -q 0
$ echo I > I $ echo I > I
$ hg ci -Am I $ hg ci -Am I
adding I adding I
created new head created new head
$ hg tglog $ hg tglog
@ 8: 'I' @ 8: 46d6f0e29c20 'I'
| |
| o 7: 'H' | o 7: 417d3b648079 'H'
| |\ | |\
| | o 6: 'G' | | o 6: 55a44ad28289 'G'
| | | | | |
| | o 5: 'F' | | o 5: dca5924bb570 'F'
| | | | | |
| | o 4: 'E' | | o 4: 8a5212ebc852 'E'
| | | | | |
| o | 3: 'D' | o | 3: 2870ad076e54 'D'
| |\| | |\|
| o | 2: 'C' | o | 2: c5cefa58fd55 'C'
|/ / |/ /
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
Rebase and collapse - E onto I: Rebase and collapse - E onto I:
$ hg clone -q -u . c c1 $ hg clone -q -u . c c1
$ cd c1 $ cd c1
$ hg rebase -s 4 --dest 8 --collapse # root (4) is not a merge $ hg rebase -s 4 --dest 8 --collapse # root (4) is not a merge
rebasing 4:8a5212ebc852 "E" rebasing 4:8a5212ebc852 "E"
rebasing 5:dca5924bb570 "F" rebasing 5:dca5924bb570 "F"
merging E merging E
rebasing 6:55a44ad28289 "G" rebasing 6:55a44ad28289 "G"
rebasing 7:417d3b648079 "H" rebasing 7:417d3b648079 "H"
saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob) saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob)
$ hg tglog $ hg tglog
o 5: 'Collapsed revision o 5: 340b34a63b39 'Collapsed revision
|\ * E |\ * E
| | * F | | * F
| | * G | | * G
| | * H' | | * H'
| @ 4: 'I' | @ 4: 46d6f0e29c20 'I'
| | | |
o | 3: 'D' o | 3: 2870ad076e54 'D'
|\ \ |\ \
| o | 2: 'C' | o | 2: c5cefa58fd55 'C'
| |/ | |/
o / 1: 'B' o / 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C C
D D
E E
G G
I I
$ hg up -q 0 $ hg up -q 0
$ echo F > F $ echo F > F
$ hg ci -Am F $ hg ci -Am F
adding F adding F
created new head created new head
$ hg tglog $ hg tglog
@ 5: 'F' @ 5: c137c2b8081f 'F'
| |
| o 4: 'E' | o 4: 0a42590ed746 'E'
| |\ | |\
| | o 3: 'D' | | o 3: 7bbcd6078bcc 'D'
| | | | | |
| o | 2: 'C' | o | 2: f838bfaca5c7 'C'
| |/ | |/
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
Rebase and collapse - B onto F: Rebase and collapse - B onto F:
$ hg clone -q -u . d d1 $ hg clone -q -u . d d1
$ cd d1 $ cd d1
$ hg rebase -s 1 --collapse --dest 5 $ hg rebase -s 1 --collapse --dest 5
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:f838bfaca5c7 "C" rebasing 2:f838bfaca5c7 "C"
rebasing 3:7bbcd6078bcc "D" rebasing 3:7bbcd6078bcc "D"
rebasing 4:0a42590ed746 "E" rebasing 4:0a42590ed746 "E"
saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob) saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob)
$ hg tglog $ hg tglog
o 2: 'Collapsed revision o 2: b72eaccb283f 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| * E' | * E'
@ 1: 'F' @ 1: c137c2b8081f 'F'
| |
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
F F
adding c adding c
$ hg up -q 0 $ hg up -q 0
$ echo 'd' > d $ echo 'd' > d
$ hg ci -Am 'D' $ hg ci -Am 'D'
adding d adding d
$ hg tglog $ hg tglog
@ 3: 'D' @ 3: 41acb9dca9eb 'D'
| |
| o 2: 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |
| o 1: 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 'A' o 0: 1994f17a630e 'A'
$ hg rebase --keepbranches --collapse -s 1 -d 3 $ hg rebase --keepbranches --collapse -s 1 -d 3
abort: cannot collapse multiple named branches abort: cannot collapse multiple named branches
[255] [255]
$ repeatchange() { $ repeatchange() {
> hg checkout $1 > hg checkout $1
> hg cp d z > hg cp d z
> echo blah >> z > echo blah >> z
> hg commit -Am "$2" --user "$3" > hg commit -Am "$2" --user "$3"
> } > }
$ repeatchange 3 "E" "user1" $ repeatchange 3 "E" "user1"
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ repeatchange 3 "E" "user2" $ repeatchange 3 "E" "user2"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head created new head
$ hg tglog $ hg tglog
@ 5: 'E' @ 5: fbfb97b1089a 'E'
| |
| o 4: 'E' | o 4: f338eb3c2c7c 'E'
|/ |/
o 3: 'D' o 3: 41acb9dca9eb 'D'
| |
| o 2: 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |
| o 1: 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 'A' o 0: 1994f17a630e 'A'
$ hg rebase -s 5 -d 4 $ hg rebase -s 5 -d 4
rebasing 5:fbfb97b1089a "E" (tip) rebasing 5:fbfb97b1089a "E" (tip)
note: rebase of 5:fbfb97b1089a created no changes to commit note: rebase of 5:fbfb97b1089a created no changes to commit
saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob) saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 4: 'E' @ 4: f338eb3c2c7c 'E'
| |
o 3: 'D' o 3: 41acb9dca9eb 'D'
| |
| o 2: 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |
| o 1: 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 'A' o 0: 1994f17a630e 'A'
$ hg export tip $ hg export tip
# HG changeset patch # HG changeset patch
# User user1 # User user1
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213
# Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 11 changes to 7 files (+1 heads) added 4 changesets with 11 changes to 7 files (+1 heads)
new changesets f447d5abf5ea:338e84e2e558 new changesets f447d5abf5ea:338e84e2e558
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q tip $ hg up -q tip
$ hg tglog $ hg tglog
@ 3: 'move2' @ 3: 338e84e2e558 'move2'
| |
o 2: 'move1' o 2: 6e7340ee38c0 'move1'
| |
| o 1: 'change' | o 1: 1352765a01d4 'change'
|/ |/
o 0: 'add' o 0: f447d5abf5ea 'add'
$ hg rebase --collapse -d 1 $ hg rebase --collapse -d 1
rebasing 2:6e7340ee38c0 "move1" rebasing 2:6e7340ee38c0 "move1"
merging a and d to d merging a and d to d
merging b and e to e merging b and e to e
merging c and f to f merging c and f to f
rebasing 3:338e84e2e558 "move2" (tip) rebasing 3:338e84e2e558 "move2" (tip)
merging f and c to c merging f and c to c
b b
b b
$ hg log -r . --template "{file_copies}\n" $ hg log -r . --template "{file_copies}\n"
d (a)g (b) d (a)g (b)
Test collapsing a middle revision in-place Test collapsing a middle revision in-place
$ hg tglog $ hg tglog
@ 2: 'Collapsed revision @ 2: 64b456429f67 'Collapsed revision
| * move1 | * move1
| * move2' | * move2'
o 1: 'change' o 1: 1352765a01d4 'change'
| |
o 0: 'add' o 0: f447d5abf5ea 'add'
$ hg rebase --collapse -r 1 -d 0 $ hg rebase --collapse -r 1 -d 0
abort: can't remove original changesets with unrebased descendants abort: can't remove original changesets with unrebased descendants
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
Test collapsing in place Test collapsing in place
$ hg up -q 0 $ hg up -q 0
$ echo C > C $ echo C > C
$ hg ci -Am C $ hg ci -Am C
adding C adding C
created new head created new head
$ hg tglog $ hg tglog
@ 2: 'C' @ 2: c5cefa58fd55 'C'
| |
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ hg heads --template="{rev}:{node} {branch}: {desc}\n" $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C 2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C
1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B
$ hg strip 2 $ hg strip 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob) saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob)
$ hg tglog $ hg tglog
o 1: 'B' o 1: 27547f69f254 'B'
| |
@ 0: 'A' @ 0: 4a2df7238c3b 'A'
$ hg heads --template="{rev}:{node} {branch}: {desc}\n" $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B
$ cd .. $ cd ..

tests/test-rebase-dest.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> allowemptycommit=1 > allowemptycommit=1
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> [phases] > [phases]
> publish=False > publish=False
> [alias] > [alias]
> tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)' > tglog = log -G --template "{rev}: {node|short} {desc} {instabilities}" -r 'sort(all(), topo)'
> [extensions] > [extensions]
> maprevset=$TESTTMP/maprevset.py > maprevset=$TESTTMP/maprevset.py
> [experimental] > [experimental]
> evolution=true > evolution=true
> EOF > EOF
$ rebasewithdag() { $ rebasewithdag() {
> N=`$PYTHON -c "print($N+1)"` > N=`$PYTHON -c "print($N+1)"`
$ rebasewithdag -r A+C+D -d 'null' <<'EOS' $ rebasewithdag -r A+C+D -d 'null' <<'EOS'
> C D > C D
> | | > | |
> A B > A B
> EOS > EOS
already rebased 0:426bada5c675 "A" (A) already rebased 0:426bada5c675 "A" (A)
already rebased 2:dc0947a82db8 "C" (C) already rebased 2:dc0947a82db8 "C" (C)
rebasing 3:004dc1679908 "D" (D tip) rebasing 3:004dc1679908 "D" (D tip)
o 4: D o 4: d8d8601abd5e D
o 2: C o 2: dc0947a82db8 C
| |
| o 1: B | o 1: fc2b737bb2e5 B
| |
o 0: A o 0: 426bada5c675 A
Destination resolves to multiple changesets: Destination resolves to multiple changesets:
$ rebasewithdag -s B -d 'ALLSRC+SRC' <<'EOS' $ rebasewithdag -s B -d 'ALLSRC+SRC' <<'EOS'
> C > C
> | > |
> B > B
> | > |
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 "B" (B)
rebasing 4:26805aba1e60 "C" (C) rebasing 4:26805aba1e60 "C" (C)
rebasing 3:cd488e83d208 "E" (E) rebasing 3:cd488e83d208 "E" (E)
rebasing 5:0069ba24938a "F" (F tip) rebasing 5:0069ba24938a "F" (F tip)
o 9: F o 9: d150ff263fc8 F
| |
o 8: E o 8: 66f30a1a2eab E
| |
| o 7: C | o 7: 93db94ffae0e C
| | | |
| o 6: B | o 6: d0071c3b0c88 B
| | | |
| o 1: D | o 1: 058c1e1fb10a D
| |
o 0: A o 0: 426bada5c675 A
Different destinations for merge changesets with a same root: Different destinations for merge changesets with a same root:
$ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS' $ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS'
> C G > C G
> |\| > |\|
> | F > | F
> | > |
> B E > B E
> |\| > |\|
> A D > A D
> EOS > EOS
rebasing 3:a4256619d830 "B" (B) rebasing 3:a4256619d830 "B" (B)
rebasing 6:8e139e245220 "C" (C tip) rebasing 6:8e139e245220 "C" (C tip)
o 8: C o 8: 51e2ce92e06a C
|\ |\
| o 7: B | o 7: 2ed0c8546285 B
| |\ | |\
o | | 5: G o | | 5: 8fdb2c1feb20 G
| | | | | |
| | o 4: E | | o 4: cd488e83d208 E
| | | | | |
o | | 2: F o | | 2: a6661b868de9 F
/ / / /
| o 1: D | o 1: 058c1e1fb10a D
| |
o 0: A o 0: 426bada5c675 A
Move to a previous parent: Move to a previous parent:
$ rebasewithdag -s E+F+G -d 'SRC^^' <<'EOS' $ rebasewithdag -s E+F+G -d 'SRC^^' <<'EOS'
> H > H
> | > |
> D G > D G
> |/ > |/
> C F > C F
> |/ > |/
> B E # E will be ignored, since E^^ is empty > B E # E will be ignored, since E^^ is empty
> |/ > |/
> A > A
> EOS > EOS
rebasing 4:33441538d4aa "F" (F) rebasing 4:33441538d4aa "F" (F)
rebasing 6:cf43ad9da869 "G" (G) rebasing 6:cf43ad9da869 "G" (G)
rebasing 7:eef94f3b5f03 "H" (H tip) rebasing 7:eef94f3b5f03 "H" (H tip)
o 10: H o 10: b3d84c6666cf H
| |
| o 5: D | o 5: f585351a92f8 D
|/ |/
o 3: C o 3: 26805aba1e60 C
| |
| o 9: G | o 9: f7c28a1a15e2 G
|/ |/
o 1: B o 1: 112478962961 B
| |
| o 8: F | o 8: 02aa697facf7 F
|/ |/
| o 2: E | o 2: 7fb047a69f22 E
|/ |/
o 0: A o 0: 426bada5c675 A
Source overlaps with destination: Source overlaps with destination:
$ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS' $ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS'
> B C D > B C D
> \|/ > \|/
> A > A
> EOS > EOS
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 "C" (C)
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
o 5: B o 5: 5fe9935d5222 B
| |
o 4: C o 4: 12d20731b9e0 C
| |
o 3: D o 3: b18e25de2cf5 D
| |
o 0: A o 0: 426bada5c675 A
Detect cycles early: Detect cycles early:
$ rebasewithdag -r 'all()-Z' -d 'map(SRC, "A:B,B:C,C:D,D:B")' <<'EOS' $ rebasewithdag -r 'all()-Z' -d 'map(SRC, "A:B,B:C,C:D,D:B")' <<'EOS'
> A B C > A B C
> \|/ > \|/
> | D > | D
> |/ > |/
> \|/ > \|/
> A > A
> EOS > EOS
already rebased 1:112478962961 "B" (B) already rebased 1:112478962961 "B" (B)
already rebased 2:dc0947a82db8 "C" (C) already rebased 2:dc0947a82db8 "C" (C)
already rebased 3:b18e25de2cf5 "D" (D) already rebased 3:b18e25de2cf5 "D" (D)
already rebased 4:312782b8f06e "E" (E) already rebased 4:312782b8f06e "E" (E)
already rebased 5:ad6717a6a58e "F" (F tip) already rebased 5:ad6717a6a58e "F" (F tip)
o 5: F o 5: ad6717a6a58e F
| |
o 3: D o 3: b18e25de2cf5 D
| |
| o 4: E | o 4: 312782b8f06e E
| |\ | |\
+---o 2: C +---o 2: dc0947a82db8 C
| | | |
| o 1: B | o 1: 112478962961 B
|/ |/
o 0: A o 0: 426bada5c675 A
Massively rewrite the DAG: Massively rewrite the DAG:
$ rebasewithdag -r 'all()' -d 'map(SRC, "A:I,I:null,H:A,B:J,J:C,C:H,D:E,F:G,G:K,K:D,E:B")' <<'EOS' $ rebasewithdag -r 'all()' -d 'map(SRC, "A:I,I:null,H:A,B:J,J:C,C:H,D:E,F:G,G:K,K:D,E:B")' <<'EOS'
> D G K > D G K
> | | | > | | |
> C F J > C F J
> | | | > | | |
> B E I > B E I
> \| | > \| |
> A H > A H
> EOS > EOS
rebasing 4:701514e1408d "I" (I) rebasing 4:701514e1408d "I" (I)
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 "A" (A)
rebasing 1:e7050b6e5048 "H" (H) rebasing 1:e7050b6e5048 "H" (H)
rebasing 5:26805aba1e60 "C" (C) rebasing 5:26805aba1e60 "C" (C)
rebasing 7:cf89f86b485b "J" (J) rebasing 7:cf89f86b485b "J" (J)
rebasing 2:112478962961 "B" (B) rebasing 2:112478962961 "B" (B)
rebasing 3:7fb047a69f22 "E" (E) rebasing 3:7fb047a69f22 "E" (E)
rebasing 8:f585351a92f8 "D" (D) rebasing 8:f585351a92f8 "D" (D)
rebasing 10:ae41898d7875 "K" (K tip) rebasing 10:ae41898d7875 "K" (K tip)
rebasing 9:711f53bbef0b "G" (G) rebasing 9:711f53bbef0b "G" (G)
rebasing 6:64a8289d2492 "F" (F) rebasing 6:64a8289d2492 "F" (F)
o 21: F o 21: 3735afb3713a F
| |
o 20: G o 20: 07698142d7a7 G
| |
o 19: K o 19: 33aba52e7e72 K
| |
o 18: D o 18: 9fdae89dc5a1 D
| |
o 17: E o 17: 277dda9a65ee E
| |
o 16: B o 16: 9c74fd8657ad B
| |
o 15: J o 15: 6527eb0688bb J
| |
o 14: C o 14: e94d655b928d C
| |
o 13: H o 13: 620d6d349459 H
| |
o 12: A o 12: a569a116758f A
| |
o 11: I o 11: 2bf1302f5c18 I
Resolve instability: Resolve instability:
$ rebasewithdag <<'EOF' -r 'orphan()-obsolete()' -d 'max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::)' $ rebasewithdag <<'EOF' -r 'orphan()-obsolete()' -d 'max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::)'
> F2 > F2
> | > |
> J E E2 > J E E2
> | |/ > | |/
> A > A
> EOF > EOF
rebasing 16:5c432343bf59 "J" (J tip) rebasing 16:5c432343bf59 "J" (J tip)
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 "C" (C)
rebasing 6:f585351a92f8 "D" (D) rebasing 6:f585351a92f8 "D" (D)
rebasing 10:ffebc37c5d0b "E3" (E3) rebasing 10:ffebc37c5d0b "E3" (E3)
rebasing 13:fb184bcfeee8 "F2" (F2) rebasing 13:fb184bcfeee8 "F2" (F2)
rebasing 11:dc838ab4c0da "G" (G) rebasing 11:dc838ab4c0da "G" (G)
o 22: G o 22: 174f63d574a8 G
| |
o 21: F2 o 21: c9d9fbe76705 F2
| |
o 20: E3 o 20: 0a03c2ede755 E3
| |
o 19: D o 19: 228d9d2541b1 D
| |
o 18: C o 18: cd856b400c95 C
| |
o 17: J o 17: 9148200c858c J
| |
o 15: I2 o 15: eb74780f5094 I2
| |
o 12: H o 12: 78309edd643f H
| |
o 5: B2 o 5: 4b4531bd8e1d B2
| |
o 4: N o 4: 337c285c272b N
| |
o 2: M o 2: 699bc4b6fa22 M
| |
o 0: A o 0: 426bada5c675 A

tests/test-rebase-detach.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}'\n" > tglog = log -G --template "{rev}: {node|short} '{desc}'\n"
> >
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> EOF > EOF
Rebasing D onto B detaching from C (one commit): Rebasing D onto B detaching from C (one commit):
$ hg init a1 $ hg init a1
> EOF > EOF
$ hg rebase -s D -d B $ hg rebase -s D -d B
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e "D" (D)
rebasing 4:69a34c08022a "E" (E tip) rebasing 4:69a34c08022a "E" (E tip)
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
$ hg tglog $ hg tglog
o 4: 'E' o 4: ee79e0744528 'E'
| |
o 3: 'D' o 3: 10530e1d72d9 'D'
| |
| o 2: 'C' | o 2: dc0947a82db8 'C'
| | | |
o | 1: 'B' o | 1: 112478962961 'B'
|/ |/
o 0: 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
D D
E E
$ cd .. $ cd ..
> EOF > EOF
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 "C" (C)
rebasing 3:e7b3f00ed42e "D" (D tip) rebasing 3:e7b3f00ed42e "D" (D tip)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob)
$ hg tglog $ hg tglog
o 3: 'D' o 3: 7375f3dbfb0f 'D'
| |
o 2: 'C' o 2: bbfdd6cb49aa 'C'
| |
o 1: 'B' o 1: 112478962961 'B'
| |
o 0: 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
$ cd .. $ cd ..
$ hg rebase -s C -d B $ hg rebase -s C -d B
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 "C" (C)
rebasing 3:e7b3f00ed42e "D" (D) rebasing 3:e7b3f00ed42e "D" (D)
rebasing 4:69a34c08022a "E" (E tip) rebasing 4:69a34c08022a "E" (E tip)
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob)
$ hg tglog $ hg tglog
o 4: 'E' o 4: e3d0c70d606d 'E'
| |
o 3: 'D' o 3: e9153d36a1af 'D'
| |
o 2: 'C' o 2: a7ac28b870a8 'C'
| |
o 1: 'B' o 1: fc2b737bb2e5 'B'
o 0: 'A' o 0: 426bada5c675 'A'
$ hg rebase -d 1 -s 3 $ hg rebase -d 1 -s 3
rebasing 3:e9153d36a1af "D" rebasing 3:e9153d36a1af "D"
rebasing 4:e3d0c70d606d "E" (tip) rebasing 4:e3d0c70d606d "E" (tip)
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob)
$ hg tglog $ hg tglog
o 4: 'E' o 4: 2c24e540eccd 'E'
| |
o 3: 'D' o 3: 73f786ed52ff 'D'
| |
| o 2: 'C' | o 2: a7ac28b870a8 'C'
|/ |/
o 1: 'B' o 1: fc2b737bb2e5 'B'
o 0: 'A' o 0: 426bada5c675 'A'
$ cd .. $ cd ..
Verify that target is not selected as external rev (issue3085) Verify that target is not selected as external rev (issue3085)
$ hg init a6 $ hg init a6
$ cd a6 $ cd a6
$ hg tag --local I $ hg tag --local I
$ hg merge H $ hg merge H
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "Merge" $ hg ci -m "Merge"
$ echo "J" >> F $ echo "J" >> F
$ hg ci -m "J" $ hg ci -m "J"
$ hg tglog $ hg tglog
@ 7: 'J' @ 7: c6aaf0d259c0 'J'
| |
o 6: 'Merge' o 6: 0cfbc7e8faaf 'Merge'
|\ |\
| o 5: 'I' | o 5: b92d164ad3cb 'I'
| | | |
o | 4: 'H' o | 4: 4ea5b230dea3 'H'
| | | |
| o 3: 'G' | o 3: c6001eacfde5 'G'
|/| |/|
o | 2: 'F' o | 2: 8908a377a434 'F'
| | | |
| o 1: 'E' | o 1: 7fb047a69f22 'E'
|/ |/
o 0: 'A' o 0: 426bada5c675 'A'
$ hg rebase -s I -d H --collapse --config ui.merge=internal:other $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
rebasing 5:b92d164ad3cb "I" (I) rebasing 5:b92d164ad3cb "I" (I)
rebasing 6:0cfbc7e8faaf "Merge" rebasing 6:0cfbc7e8faaf "Merge"
rebasing 7:c6aaf0d259c0 "J" (tip) rebasing 7:c6aaf0d259c0 "J" (tip)
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob) saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 5: 'Collapsed revision @ 5: 65079693dac4 'Collapsed revision
| * I | * I
| * Merge | * Merge
| * J' | * J'
o 4: 'H' o 4: 4ea5b230dea3 'H'
| |
| o 3: 'G' | o 3: c6001eacfde5 'G'
|/| |/|
o | 2: 'F' o | 2: 8908a377a434 'F'
| | | |
| o 1: 'E' | o 1: 7fb047a69f22 'E'
|/ |/
o 0: 'A' o 0: 426bada5c675 'A'
$ hg log --rev tip $ hg log --rev tip
changeset: 5:65079693dac4 changeset: 5:65079693dac4
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Collapsed revision summary: Collapsed revision

tests/test-rebase-interruptions.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ echo A > A $ echo A > A
$ hg ci -Am A $ hg ci -Am A
Changes during an interruption - continue: Changes during an interruption - continue:
$ hg clone -q -u . a a1 $ hg clone -q -u . a a1
$ cd a1 $ cd a1
$ hg tglog $ hg tglog
@ 4: 'E' @ 4: ae36e8e3dfd7 'E'
| |
o 3: 'D' o 3: 46b37eabc604 'D'
| |
| o 2: 'C' | o 2: 965c486023db 'C'
| | | |
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
Force a commit on C during the interruption: Force a commit on C during the interruption:
$ hg up -q -C 2 --config 'extensions.rebase=!' $ hg up -q -C 2 --config 'extensions.rebase=!'
$ echo 'Extra' > Extra $ echo 'Extra' > Extra
$ hg add Extra $ hg add Extra
$ hg ci -m 'Extra' --config 'extensions.rebase=!' $ hg ci -m 'Extra' --config 'extensions.rebase=!'
Force this commit onto secret phase Force this commit onto secret phase
$ hg phase --force --secret 6 $ hg phase --force --secret 6
$ hg tglogp $ hg tglogp
@ 6:secret 'Extra' @ 6: deb5d2f93d8b secret 'Extra'
| |
| o 5:draft 'B' | o 5: 45396c49d53b draft 'B'
| | | |
| o 4:draft 'E' | o 4: ae36e8e3dfd7 draft 'E'
| | | |
| o 3:draft 'D' | o 3: 46b37eabc604 draft 'D'
| | | |
o | 2:draft 'C' o | 2: 965c486023db draft 'C'
| | | |
o | 1:draft 'B' o | 1: 27547f69f254 draft 'B'
|/ |/
o 0:draft 'A' o 0: 4a2df7238c3b draft 'A'
Resume the rebasing: Resume the rebasing:
$ hg rebase --continue $ hg rebase --continue
already rebased 1:27547f69f254 "B" as 45396c49d53b already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
already rebased 1:27547f69f254 "B" as 45396c49d53b already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db
$ hg tglogp $ hg tglogp
o 7:draft 'C' o 7: d2d25e26288e draft 'C'
| |
| o 6:secret 'Extra' | o 6: deb5d2f93d8b secret 'Extra'
| | | |
o | 5:draft 'B' o | 5: 45396c49d53b draft 'B'
| | | |
@ | 4:draft 'E' @ | 4: ae36e8e3dfd7 draft 'E'
| | | |
o | 3:draft 'D' o | 3: 46b37eabc604 draft 'D'
| | | |
| o 2:draft 'C' | o 2: 965c486023db draft 'C'
| | | |
| o 1:draft 'B' | o 1: 27547f69f254 draft 'B'
|/ |/
o 0:draft 'A' o 0: 4a2df7238c3b draft 'A'
$ cd .. $ cd ..
Changes during an interruption - abort: Changes during an interruption - abort:
$ hg clone -q -u . a a2 $ hg clone -q -u . a a2
$ cd a2 $ cd a2
$ hg tglog $ hg tglog
@ 4: 'E' @ 4: ae36e8e3dfd7 'E'
| |
o 3: 'D' o 3: 46b37eabc604 'D'
| |
| o 2: 'C' | o 2: 965c486023db 'C'
| | | |
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
Force a commit on B' during the interruption: Force a commit on B' during the interruption:
$ hg up -q -C 5 --config 'extensions.rebase=!' $ hg up -q -C 5 --config 'extensions.rebase=!'
$ echo 'Extra' > Extra $ echo 'Extra' > Extra
$ hg add Extra $ hg add Extra
$ hg ci -m 'Extra' --config 'extensions.rebase=!' $ hg ci -m 'Extra' --config 'extensions.rebase=!'
$ hg tglog $ hg tglog
@ 6: 'Extra' @ 6: 402ee3642b59 'Extra'
| |
o 5: 'B' o 5: 45396c49d53b 'B'
| |
o 4: 'E' o 4: ae36e8e3dfd7 'E'
| |
o 3: 'D' o 3: 46b37eabc604 'D'
| |
| o 2: 'C' | o 2: 965c486023db 'C'
| | | |
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
Abort the rebasing: Abort the rebasing:
$ hg rebase --abort $ hg rebase --abort
warning: new changesets detected on destination branch, can't strip warning: new changesets detected on destination branch, can't strip
rebase aborted rebase aborted
$ hg tglog $ hg tglog
@ 6: 'Extra' @ 6: 402ee3642b59 'Extra'
| |
o 5: 'B' o 5: 45396c49d53b 'B'
| |
o 4: 'E' o 4: ae36e8e3dfd7 'E'
| |
o 3: 'D' o 3: 46b37eabc604 'D'
| |
| o 2: 'C' | o 2: 965c486023db 'C'
| | | |
| o 1: 'B' | o 1: 27547f69f254 'B'
|/ |/
o 0: 'A' o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
Changes during an interruption - abort (again): Changes during an interruption - abort (again):
$ hg clone -q -u . a a3 $ hg clone -q -u . a a3
$ cd a3 $ cd a3
$ hg tglogp $ hg tglogp
@ 4:draft 'E' @ 4: ae36e8e3dfd7 draft 'E'
| |
o 3:draft 'D' o 3: 46b37eabc604 draft 'D'
| |
| o 2:draft 'C' | o 2: 965c486023db draft 'C'
| | | |
| o 1:draft 'B' | o 1: 27547f69f254 draft 'B'
|/ |/
o 0:draft 'A' o 0: 4a2df7238c3b draft 'A'
Rebasing B onto E: Rebasing B onto E:
$ hg rebase -s 1 -d 4 $ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B" rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
Change phase on B and B' Change phase on B and B'
$ hg up -q -C 5 --config 'extensions.rebase=!' $ hg up -q -C 5 --config 'extensions.rebase=!'
$ hg phase --public 1 $ hg phase --public 1
$ hg phase --public 5 $ hg phase --public 5
$ hg phase --secret -f 2 $ hg phase --secret -f 2
$ hg tglogp $ hg tglogp
@ 5:public 'B' @ 5: 45396c49d53b public 'B'
| |
o 4:public 'E' o 4: ae36e8e3dfd7 public 'E'
| |
o 3:public 'D' o 3: 46b37eabc604 public 'D'
| |
| o 2:secret 'C' | o 2: 965c486023db secret 'C'
| | | |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
Abort the rebasing: Abort the rebasing:
$ hg rebase --abort $ hg rebase --abort
warning: can't clean up public changesets 45396c49d53b warning: can't clean up public changesets 45396c49d53b
rebase aborted rebase aborted
$ hg tglogp $ hg tglogp
@ 5:public 'B' @ 5: 45396c49d53b public 'B'
| |
o 4:public 'E' o 4: ae36e8e3dfd7 public 'E'
| |
o 3:public 'D' o 3: 46b37eabc604 public 'D'
| |
| o 2:secret 'C' | o 2: 965c486023db secret 'C'
| | | |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
Test rebase interrupted by hooks Test rebase interrupted by hooks
$ hg up 2 $ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo F > F $ echo F > F
$ hg add F $ hg add F
$ hg ci -m F $ hg ci -m F
$ cd .. $ cd ..
(precommit version) (precommit version)
$ cp -R a3 hook-precommit $ cp -R a3 hook-precommit
$ cd hook-precommit $ cd hook-precommit
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
M A M A
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 "F" (tip)
abort: precommit hook exited with status 1 abort: precommit hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7:secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| @ 6:secret 'F' | @ 6: a0b2430ebfb8 secret 'F'
| | | |
o | 5:public 'B' o | 5: 45396c49d53b public 'B'
| | | |
o | 4:public 'E' o | 4: ae36e8e3dfd7 public 'E'
| | | |
o | 3:public 'D' o | 3: 46b37eabc604 public 'D'
| | | |
| o 2:secret 'C' | o 2: 965c486023db secret 'C'
| | | |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F" rebasing 6:a0b2430ebfb8 "F"
saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
$ hg tglogp $ hg tglogp
@ 6:secret 'F' @ 6: 6e92a149ac6b secret 'F'
| |
o 5:secret 'C' o 5: 401ccec5e39f secret 'C'
| |
o 4:public 'B' o 4: 45396c49d53b public 'B'
| |
o 3:public 'E' o 3: ae36e8e3dfd7 public 'E'
| |
o 2:public 'D' o 2: 46b37eabc604 public 'D'
| |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ cd .. $ cd ..
(pretxncommit version) (pretxncommit version)
$ cp -R a3 hook-pretxncommit $ cp -R a3 hook-pretxncommit
$ cd hook-pretxncommit $ cd hook-pretxncommit
#if windows #if windows
$ NODE="%HG_NODE%" $ NODE="%HG_NODE%"
#else #else
$ NODE="\$HG_NODE" $ NODE="\$HG_NODE"
#endif #endif
$ hg rebase --source 2 --dest 5 --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE | grep \"summary: C\"" $ hg rebase --source 2 --dest 5 --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE | grep \"summary: C\""
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
summary: C summary: C
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 "F" (tip)
transaction abort! transaction abort!
rollback completed rollback completed
abort: pretxncommit hook exited with status 1 abort: pretxncommit hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7:secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| @ 6:secret 'F' | @ 6: a0b2430ebfb8 secret 'F'
| | | |
o | 5:public 'B' o | 5: 45396c49d53b public 'B'
| | | |
o | 4:public 'E' o | 4: ae36e8e3dfd7 public 'E'
| | | |
o | 3:public 'D' o | 3: 46b37eabc604 public 'D'
| | | |
| o 2:secret 'C' | o 2: 965c486023db secret 'C'
| | | |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F" rebasing 6:a0b2430ebfb8 "F"
saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
$ hg tglogp $ hg tglogp
@ 6:secret 'F' @ 6: 6e92a149ac6b secret 'F'
| |
o 5:secret 'C' o 5: 401ccec5e39f secret 'C'
| |
o 4:public 'B' o 4: 45396c49d53b public 'B'
| |
o 3:public 'E' o 3: ae36e8e3dfd7 public 'E'
| |
o 2:public 'D' o 2: 46b37eabc604 public 'D'
| |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ cd .. $ cd ..
(pretxnclose version) (pretxnclose version)
$ cp -R a3 hook-pretxnclose $ cp -R a3 hook-pretxnclose
$ cd hook-pretxnclose $ cd hook-pretxnclose
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
summary: C summary: C
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 "F" (tip)
transaction abort! transaction abort!
rollback completed rollback completed
abort: pretxnclose hook exited with status 1 abort: pretxnclose hook exited with status 1
[255] [255]
$ hg tglogp $ hg tglogp
@ 7:secret 'C' @ 7: 401ccec5e39f secret 'C'
| |
| @ 6:secret 'F' | @ 6: a0b2430ebfb8 secret 'F'
| | | |
o | 5:public 'B' o | 5: 45396c49d53b public 'B'
| | | |
o | 4:public 'E' o | 4: ae36e8e3dfd7 public 'E'
| | | |
o | 3:public 'D' o | 3: 46b37eabc604 public 'D'
| | | |
| o 2:secret 'C' | o 2: 965c486023db secret 'C'
| | | |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F" rebasing 6:a0b2430ebfb8 "F"
saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob)
$ hg tglogp $ hg tglogp
@ 6:secret 'F' @ 6: 6e92a149ac6b secret 'F'
| |
o 5:secret 'C' o 5: 401ccec5e39f secret 'C'
| |
o 4:public 'B' o 4: 45396c49d53b public 'B'
| |
o 3:public 'E' o 3: ae36e8e3dfd7 public 'E'
| |
o 2:public 'D' o 2: 46b37eabc604 public 'D'
| |
| o 1:public 'B' | o 1: 27547f69f254 public 'B'
|/ |/
o 0:public 'A' o 0: 4a2df7238c3b public 'A'
$ cd .. $ cd ..
Make sure merge state is cleaned up after a no-op rebase merge (issue5494) Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo a > a $ echo a > a
$ hg commit -qAm base $ hg commit -qAm base

tests/test-rebase-issue-noparam-single-rev.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ echo c1 > c1 $ echo c1 > c1
$ hg ci -Am c1 $ hg ci -Am c1
adding r1 adding r1
created new head created new head
$ echo r2 > r2 $ echo r2 > r2
$ hg ci -Am r2 $ hg ci -Am r2
adding r2 adding r2
$ hg tglog $ hg tglog
@ 4: 'r2' @ 4: 225af64d03e6 'r2'
| |
o 3: 'r1' o 3: 8d0a8c99b309 'r1'
| |
| o 2: 'l1' | o 2: 87c180a611f2 'l1'
|/ |/
o 1: 'c2' o 1: 56daeba07f4b 'c2'
| |
o 0: 'c1' o 0: e8faad3d03ff 'c1'
Rebase with no arguments - single revision in source branch: Rebase with no arguments - single revision in source branch:
$ hg up -q -C 2 $ hg up -q -C 2
$ hg rebase $ hg rebase
rebasing 2:87c180a611f2 "l1" rebasing 2:87c180a611f2 "l1"
saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 4: 'l1' @ 4: b1152cc99655 'l1'
| |
o 3: 'r2' o 3: 225af64d03e6 'r2'
| |
o 2: 'r1' o 2: 8d0a8c99b309 'r1'
| |
o 1: 'c2' o 1: 56daeba07f4b 'c2'
| |
o 0: 'c1' o 0: e8faad3d03ff 'c1'
$ cd .. $ cd ..
$ hg init b $ hg init b
$ cd b $ cd b
$ echo c1 > c1 $ echo c1 > c1
$ hg up -q -C 1 $ hg up -q -C 1
$ echo r1 > r1 $ echo r1 > r1
$ hg ci -Am r1 $ hg ci -Am r1
adding r1 adding r1
created new head created new head
$ hg tglog $ hg tglog
@ 4: 'r1' @ 4: 8d0a8c99b309 'r1'
| |
| o 3: 'l2' | o 3: 1ac923b736ef 'l2'
| | | |
| o 2: 'l1' | o 2: 87c180a611f2 'l1'
|/ |/
o 1: 'c2' o 1: 56daeba07f4b 'c2'
| |
o 0: 'c1' o 0: e8faad3d03ff 'c1'
Rebase with no arguments - single revision in target branch: Rebase with no arguments - single revision in target branch:
$ hg up -q -C 3 $ hg up -q -C 3
$ hg rebase $ hg rebase
rebasing 2:87c180a611f2 "l1" rebasing 2:87c180a611f2 "l1"
rebasing 3:1ac923b736ef "l2" rebasing 3:1ac923b736ef "l2"
saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 4: 'l2' @ 4: 023181307ed0 'l2'
| |
o 3: 'l1' o 3: 913ab52b43b4 'l1'
| |
o 2: 'r1' o 2: 8d0a8c99b309 'r1'
| |
o 1: 'c2' o 1: 56daeba07f4b 'c2'
| |
o 0: 'c1' o 0: e8faad3d03ff 'c1'
$ cd .. $ cd ..

tests/test-rebase-mq-skip.t

This emulates the effects of an hg pull --rebase in which the remote repo This emulates the effects of an hg pull --rebase in which the remote repo
already has one local mq patch already has one local mq patch
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [format] > [format]
> usegeneraldelta=yes > usegeneraldelta=yes
> [extensions] > [extensions]
> rebase= > rebase=
> mq= > mq=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ hg qinit -c $ hg qinit -c
$ echo c1 > c1 $ echo c1 > c1
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
rebase completed rebase completed
1 revisions have been skipped 1 revisions have been skipped
$ hg tglog $ hg tglog
@ 3: 'P0' tags: p0.patch qbase qtip tip @ 3: 9ecc820b1737 'P0' tags: p0.patch qbase qtip tip
| |
o 2: 'P1' tags: qparent o 2: 869d8b134a27 'P1' tags: qparent
| |
o 1: 'R1' tags: o 1: da108f2755df 'R1' tags:
| |
o 0: 'C1' tags: o 0: cd320d50b341 'C1' tags:
$ cd .. $ cd ..
$ hg init b $ hg init b
$ cd b $ cd b
$ hg qinit -c $ hg qinit -c
rebasing 4:094320fec554 "r4" (r4) rebasing 4:094320fec554 "r4" (r4)
note: rebase of 4:094320fec554 created no changes to commit note: rebase of 4:094320fec554 created no changes to commit
rebasing 5:681a378595ba "r5" (r5) rebasing 5:681a378595ba "r5" (r5)
rebasing 6:512a1f24768b "r6" (qtip r6) rebasing 6:512a1f24768b "r6" (qtip r6)
note: rebase of 6:512a1f24768b created no changes to commit note: rebase of 6:512a1f24768b created no changes to commit
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 8: 'r5' tags: qtip r5 tip @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
| |
o 7: 'r2' tags: qbase r2 o 7: 1660ab13ce9a 'r2' tags: qbase r2
| |
o 6: 'branch2-r6' tags: qparent o 6: 057f55ff8f44 'branch2-r6' tags: qparent
| |
o 5: 'branch2-r4' tags: o 5: 1d7287f8deb1 'branch2-r4' tags:
| |
o 4: 'branch2-r8' tags: o 4: 3c10b9db2bd5 'branch2-r8' tags:
| |
o 3: 'branch2-r7' tags: o 3: b684023158dc 'branch2-r7' tags:
| |
o 2: 'branch2-r3' tags: o 2: d817754b1251 'branch2-r3' tags:
| |
o 1: 'branch2-r1' tags: o 1: 0621a206f8a4 'branch2-r1' tags:
| |
o 0: 'r0' tags: o 0: 222799e2f90b 'r0' tags:
$ cd .. $ cd ..

tests/test-rebase-mq.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> mq= > mq=
> >
> [mq] > [mq]
> plain=true > plain=true
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ hg qinit -c $ hg qinit -c
$ echo c1 > f $ echo c1 > f
$ echo mq1 > f $ echo mq1 > f
$ hg qref -m P0 $ hg qref -m P0
$ hg qnew f2.patch $ hg qnew f2.patch
$ echo mq2 > f $ echo mq2 > f
$ hg qref -m P1 -d '2 0' $ hg qref -m P1 -d '2 0'
$ hg tglog $ hg tglog
@ 3: 'P1' tags: f2.patch qtip tip @ 3: 929394423cd3 'P1' tags: f2.patch qtip tip
| |
o 2: 'P0' tags: f.patch qbase o 2: 3504f44bffc0 'P0' tags: f.patch qbase
| |
| o 1: 'R1' tags: | o 1: bac9ed9960d8 'R1' tags:
|/ |/
o 0: 'C1' tags: qparent o 0: 36f36ddbca61 'C1' tags: qparent
Rebase - try to rebase on an applied mq patch: Rebase - try to rebase on an applied mq patch:
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
abort: cannot rebase onto an applied mq patch abort: cannot rebase onto an applied mq patch
[255] [255]
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
rebasing 3:929394423cd3 "P1" (f2.patch qtip) rebasing 3:929394423cd3 "P1" (f2.patch qtip)
saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'P1' tags: f2.patch qtip tip @ 3: 462012cf340c 'P1' tags: f2.patch qtip tip
| |
o 2: 'P0' tags: f.patch qbase o 2: ebe9914c0d1c 'P0' tags: f.patch qbase
| |
o 1: 'R1' tags: qparent o 1: bac9ed9960d8 'R1' tags: qparent
| |
o 0: 'C1' tags: o 0: 36f36ddbca61 'C1' tags:
$ hg up -q qbase $ hg up -q qbase
$ cat f $ cat f
mq1r1 mq1r1
$ cat .hg/patches/f.patch $ cat .hg/patches/f.patch
# HG changeset patch # HG changeset patch
$ hg qguard -l $ hg qguard -l
guarded: +guarded guarded: +guarded
empty-important: unguarded empty-important: unguarded
bar: +baz bar: +baz
foo: +baz foo: +baz
$ hg tglog $ hg tglog
@ 2: 'imported patch bar' tags: bar qtip tip @ 2: 4f44b861d38c 'imported patch bar' tags: bar qtip tip
| |
o 1: 'important commit message' tags: empty-important qbase o 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase
| |
o 0: 'a' tags: qparent o 0: cb9a9f314b8b 'a' tags: qparent
Create new head to rebase bar onto: Create new head to rebase bar onto:
$ hg up -C 0 $ hg up -C 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > b $ echo b > b
$ hg add b $ hg add b
$ hg ci -m b $ hg ci -m b
created new head created new head
$ hg up -C 2 $ hg up -C 2
1 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 $ echo a >> a
$ hg qref $ hg qref
$ hg tglog $ hg tglog
@ 3: '[mq]: bar' tags: bar qtip tip @ 3: d526d4536ed6 '[mq]: bar' tags: bar qtip tip
| |
| o 2: 'b' tags: | o 2: d2ae7f538514 'b' tags:
| | | |
o | 1: 'important commit message' tags: empty-important qbase o | 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase
|/ |/
o 0: 'a' tags: qparent o 0: cb9a9f314b8b 'a' tags: qparent
Rebase bar (make sure series order is preserved and empty-important also is Rebase bar (make sure series order is preserved and empty-important also is
removed from the series): removed from the series):
$ hg qseries $ hg qseries
guarded guarded
empty-important empty-important
[1] [1]
$ hg qguard -l $ hg qguard -l
guarded: +guarded guarded: +guarded
bar: +baz bar: +baz
foo: +baz foo: +baz
$ hg tglog $ hg tglog
@ 2: '[mq]: bar' tags: bar qbase qtip tip @ 2: 477d948bb2af '[mq]: bar' tags: bar qbase qtip tip
| |
o 1: 'b' tags: qparent o 1: d2ae7f538514 'b' tags: qparent
| |
o 0: 'a' tags: o 0: cb9a9f314b8b 'a' tags:
$ cd .. $ cd ..

tests/test-rebase-named-branches.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
$ echo x > x $ echo x > x
$ hg add x $ hg add x
$ hg ci -m 'dev-two named branch' $ hg ci -m 'dev-two named branch'
$ hg tglog $ hg tglog
@ 9: 'dev-two named branch' dev-two @ 9: cb039b7cae8e 'dev-two named branch' dev-two
| |
| o 8: 'dev-one named branch' dev-one | o 8: 643fc9128048 'dev-one named branch' dev-one
| | | |
o | 7: 'H' o | 7: 02de42196ebe 'H'
| | | |
+---o 6: 'G' +---o 6: eea13746799a 'G'
| | | | | |
o | | 5: 'F' o | | 5: 24b6387c8c8c 'F'
| | | | | |
+---o 4: 'E' +---o 4: 9520eea781bc 'E'
| | | |
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
Branch name containing a dash (issue3181) Branch name containing a dash (issue3181)
$ hg rebase -b dev-two -d dev-one --keepbranches $ hg rebase -b dev-two -d dev-one --keepbranches
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" rebasing 7:02de42196ebe "H"
rebasing 9:cb039b7cae8e "dev-two named branch" (tip) rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 9: 'dev-two named branch' dev-two @ 9: 9e70cd31750f 'dev-two named branch' dev-two
| |
o 8: 'H' o 8: 31d0e4ba75e6 'H'
| |
| o 7: 'G' | o 7: 4b988a958030 'G'
|/| |/|
o | 6: 'F' o | 6: 24de4aff8e28 'F'
| | | |
o | 5: 'dev-one named branch' dev-one o | 5: 643fc9128048 'dev-one named branch' dev-one
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
| | | |
o | 3: 'D' o | 3: 32af7686d403 'D'
| | | |
o | 2: 'C' o | 2: 5fddd98957c8 'C'
| | | |
o | 1: 'B' o | 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg rebase -s dev-one -d 0 --keepbranches $ hg rebase -s dev-one -d 0 --keepbranches
rebasing 5:643fc9128048 "dev-one named branch" rebasing 5:643fc9128048 "dev-one named branch"
rebasing 6:24de4aff8e28 "F" rebasing 6:24de4aff8e28 "F"
rebasing 7:4b988a958030 "G" rebasing 7:4b988a958030 "G"
rebasing 8:31d0e4ba75e6 "H" rebasing 8:31d0e4ba75e6 "H"
rebasing 9:9e70cd31750f "dev-two named branch" (tip) rebasing 9:9e70cd31750f "dev-two named branch" (tip)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 9: 'dev-two named branch' dev-two @ 9: 59c2e59309fe 'dev-two named branch' dev-two
| |
o 8: 'H' o 8: 904590360559 'H'
| |
| o 7: 'G' | o 7: 1a1e6f72ec38 'G'
|/| |/|
o | 6: 'F' o | 6: 42aa3cf0fa7a 'F'
| | | |
o | 5: 'dev-one named branch' dev-one o | 5: bc8139ee757c 'dev-one named branch' dev-one
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg update 3 $ hg update 3
3 files updated, 0 files merged, 3 files removed, 0 files unresolved 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg branch -f dev-one $ hg branch -f dev-one
marked working directory as branch dev-one marked working directory as branch dev-one
$ hg ci -m 'dev-one named branch' $ hg ci -m 'dev-one named branch'
created new head created new head
$ hg tglog $ hg tglog
@ 10: 'dev-one named branch' dev-one @ 10: 643fc9128048 'dev-one named branch' dev-one
| |
| o 9: 'dev-two named branch' dev-two | o 9: 59c2e59309fe 'dev-two named branch' dev-two
| | | |
| o 8: 'H' | o 8: 904590360559 'H'
| | | |
| | o 7: 'G' | | o 7: 1a1e6f72ec38 'G'
| |/| | |/|
| o | 6: 'F' | o | 6: 42aa3cf0fa7a 'F'
| | | | | |
| o | 5: 'dev-one named branch' dev-one | o | 5: bc8139ee757c 'dev-one named branch' dev-one
| | | | | |
| | o 4: 'E' | | o 4: 9520eea781bc 'E'
| |/ | |/
o | 3: 'D' o | 3: 32af7686d403 'D'
| | | |
o | 2: 'C' o | 2: 5fddd98957c8 'C'
| | | |
o | 1: 'B' o | 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches
rebasing 5:bc8139ee757c "dev-one named branch" rebasing 5:bc8139ee757c "dev-one named branch"
note: rebase of 5:bc8139ee757c created no changes to commit note: rebase of 5:bc8139ee757c created no changes to commit
rebasing 6:42aa3cf0fa7a "F" rebasing 6:42aa3cf0fa7a "F"
rebasing 7:1a1e6f72ec38 "G" rebasing 7:1a1e6f72ec38 "G"
rebasing 8:904590360559 "H" rebasing 8:904590360559 "H"
rebasing 9:59c2e59309fe "dev-two named branch" rebasing 9:59c2e59309fe "dev-two named branch"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob)
$ hg tglog $ hg tglog
o 9: 'dev-two named branch' dev-two o 9: 71325f8bc082 'dev-two named branch' dev-two
| |
o 8: 'H' o 8: 12b2bc666e20 'H'
| |
| o 7: 'G' | o 7: 549f007a9f5f 'G'
|/| |/|
o | 6: 'F' o | 6: 679f28760620 'F'
| | | |
@ | 5: 'dev-one named branch' dev-one @ | 5: 643fc9128048 'dev-one named branch' dev-one
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
| | | |
o | 3: 'D' o | 3: 32af7686d403 'D'
| | | |
o | 2: 'C' o | 2: 5fddd98957c8 'C'
| | | |
o | 1: 'B' o | 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches
rebasing 5:643fc9128048 "dev-one named branch" rebasing 5:643fc9128048 "dev-one named branch"
rebasing 6:679f28760620 "F" rebasing 6:679f28760620 "F"
rebasing 7:549f007a9f5f "G" rebasing 7:549f007a9f5f "G"
rebasing 8:12b2bc666e20 "H" rebasing 8:12b2bc666e20 "H"
rebasing 9:71325f8bc082 "dev-two named branch" (tip) rebasing 9:71325f8bc082 "dev-two named branch" (tip)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob)
$ hg tglog $ hg tglog
o 9: 'dev-two named branch' dev-two o 9: 3944801ae4ea 'dev-two named branch' dev-two
| |
o 8: 'H' o 8: 8e279d293175 'H'
| |
| o 7: 'G' | o 7: aeefee77ab01 'G'
|/| |/|
o | 6: 'F' o | 6: e908b85f3729 'F'
| | | |
@ | 5: 'dev-one named branch' dev-one @ | 5: bc8139ee757c 'dev-one named branch' dev-one
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg up -r 0 > /dev/null $ hg up -r 0 > /dev/null
Rebasing descendant onto ancestor across different named branches Rebasing descendant onto ancestor across different named branches
$ hg rebase -s 1 -d 9 --keepbranches $ hg rebase -s 1 -d 9 --keepbranches
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
o 9: 'D' o 9: e9f862ce8bad 'D'
| |
o 8: 'C' o 8: a0d543090fa4 'C'
| |
o 7: 'B' o 7: 3bdb949809d9 'B'
| |
o 6: 'dev-two named branch' dev-two o 6: 3944801ae4ea 'dev-two named branch' dev-two
| |
o 5: 'H' o 5: 8e279d293175 'H'
| |
| o 4: 'G' | o 4: aeefee77ab01 'G'
|/| |/|
o | 3: 'F' o | 3: e908b85f3729 'F'
| | | |
o | 2: 'dev-one named branch' dev-one o | 2: bc8139ee757c 'dev-one named branch' dev-one
| | | |
| o 1: 'E' | o 1: 9520eea781bc 'E'
|/ |/
@ 0: 'A' @ 0: cd010b8cd998 'A'
$ hg rebase -s 5 -d 6 $ hg rebase -s 5 -d 6
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [255]
$ hg rebase -s 6 -d 5 $ hg rebase -s 6 -d 5
rebasing 6:3944801ae4ea "dev-two named branch" rebasing 6:3944801ae4ea "dev-two named branch"
rebasing 7:3bdb949809d9 "B" rebasing 7:3bdb949809d9 "B"
rebasing 8:a0d543090fa4 "C" rebasing 8:a0d543090fa4 "C"
rebasing 9:e9f862ce8bad "D" (tip) rebasing 9:e9f862ce8bad "D" (tip)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob)
$ hg tglog $ hg tglog
o 9: 'D' o 9: e522577ccdbd 'D'
| |
o 8: 'C' o 8: 810110211f50 'C'
| |
o 7: 'B' o 7: 160b0930ccc6 'B'
| |
o 6: 'dev-two named branch' o 6: c57724c84928 'dev-two named branch'
| |
o 5: 'H' o 5: 8e279d293175 'H'
| |
| o 4: 'G' | o 4: aeefee77ab01 'G'
|/| |/|
o | 3: 'F' o | 3: e908b85f3729 'F'
| | | |
o | 2: 'dev-one named branch' dev-one o | 2: bc8139ee757c 'dev-one named branch' dev-one
| | | |
| o 1: 'E' | o 1: 9520eea781bc 'E'
|/ |/
@ 0: 'A' @ 0: cd010b8cd998 'A'
Reopen branch by rebase Reopen branch by rebase
$ hg up -qr3 $ hg up -qr3
$ hg branch -q b $ hg branch -q b
$ hg ci -m 'create b' $ hg ci -m 'create b'
$ hg ci -m 'close b' --close $ hg ci -m 'close b' --close
$ hg up -qr -2 $ hg up -qr -2
$ hg branch -qf b $ hg branch -qf b
$ hg ci -qm 'b2' $ hg ci -qm 'b2'
$ hg up -qr -3 $ hg up -qr -3
$ hg branch -q c $ hg branch -q c
$ hg ci -m 'c1' $ hg ci -m 'c1'
$ hg tglog $ hg tglog
@ 3: 'c1' c @ 3: c062e3ecd6c6 'c1' c
| |
| o 2: 'b2' b | o 2: 792845bb77ee 'b2' b
|/ |/
| o 1: 'b1' b | o 1: 40039acb7ca5 'b1' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
$ hg clone -q . ../case2 $ hg clone -q . ../case2
rebase 'b2' to another lower branch head rebase 'b2' to another lower branch head
$ hg up -qr 2 $ hg up -qr 2
$ hg rebase $ hg rebase
rebasing 2:792845bb77ee "b2" rebasing 2:792845bb77ee "b2"
note: rebase of 2:792845bb77ee created no changes to commit note: rebase of 2:792845bb77ee created no changes to commit
saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob) saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob)
$ hg tglog $ hg tglog
o 2: 'c1' c o 2: c062e3ecd6c6 'c1' c
| |
| @ 1: 'b1' b | @ 1: 40039acb7ca5 'b1' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1')
$ cd ../case2 $ cd ../case2
$ hg up -qr 1 $ hg up -qr 1
$ hg rebase $ hg rebase
rebasing 1:40039acb7ca5 "b1" rebasing 1:40039acb7ca5 "b1"
saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob) saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'b1' b @ 3: 76abc1c6f8c7 'b1' b
| |
| o 2: 'c1' c | o 2: c062e3ecd6c6 'c1' c
| | | |
o | 1: 'b2' b o | 1: 792845bb77ee 'b2' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
rebase 'c1' to the branch head 'c2' that is closed rebase 'c1' to the branch head 'c2' that is closed
$ hg branch -qf c $ hg branch -qf c
$ hg ci -qm 'c2 closed' --close $ hg ci -qm 'c2 closed' --close
$ hg up -qr 2 $ hg up -qr 2
$ hg tglog $ hg tglog
_ 4: 'c2 closed' c _ 4: 8427af5d86f2 'c2 closed' c
| |
o 3: 'b1' b o 3: 76abc1c6f8c7 'b1' b
| |
| @ 2: 'c1' c | @ 2: c062e3ecd6c6 'c1' c
| | | |
o | 1: 'b2' b o | 1: 792845bb77ee 'b2' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
$ hg rebase $ hg rebase
abort: branch 'c' has one head - please rebase to an explicit rev abort: branch 'c' has one head - please rebase to an explicit rev
(run 'hg heads' to see all heads) (run 'hg heads' to see all heads)
[255] [255]
$ hg tglog $ hg tglog
_ 4: 'c2 closed' c _ 4: 8427af5d86f2 'c2 closed' c
| |
o 3: 'b1' b o 3: 76abc1c6f8c7 'b1' b
| |
| @ 2: 'c1' c | @ 2: c062e3ecd6c6 'c1' c
| | | |
o | 1: 'b2' b o | 1: 792845bb77ee 'b2' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
$ hg up -cr 1 $ hg up -cr 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch x $ hg branch x
marked working directory as branch x marked working directory as branch x
$ hg rebase -r 3:: -d . $ hg rebase -r 3:: -d .
rebasing 3:76abc1c6f8c7 "b1" rebasing 3:76abc1c6f8c7 "b1"
rebasing 4:8427af5d86f2 "c2 closed" (tip) rebasing 4:8427af5d86f2 "c2 closed" (tip)
note: rebase of 4:8427af5d86f2 created no changes to commit note: rebase of 4:8427af5d86f2 created no changes to commit
saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob) saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob)
$ hg tglog $ hg tglog
o 3: 'b1' x o 3: 117b0ed08075 'b1' x
| |
| o 2: 'c1' c | o 2: c062e3ecd6c6 'c1' c
| | | |
@ | 1: 'b2' b @ | 1: 792845bb77ee 'b2' b
|/ |/
o 0: '0' o 0: d681519c3ea7 '0'
$ cd .. $ cd ..

tests/test-rebase-newancestor.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [format] > [format]
> usegeneraldelta=yes > usegeneraldelta=yes
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo A > a $ echo A > a
$ echo >> a $ echo >> a
$ hg ci -Am A $ hg ci -Am A
$ hg up -q -C 0 $ hg up -q -C 0
$ echo D >> a $ echo D >> a
$ hg ci -Am AD $ hg ci -Am AD
created new head created new head
$ hg tglog $ hg tglog
@ 3: 'AD' @ 3: 3878212183bd 'AD'
| |
| o 2: 'C' | o 2: 30ae917c0e4f 'C'
| | | |
| o 1: 'B' | o 1: 0f4f7cb4f549 'B'
|/ |/
o 0: 'A' o 0: 1e635d440a73 'A'
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
rebasing 1:0f4f7cb4f549 "B" rebasing 1:0f4f7cb4f549 "B"
merging a merging a
rebasing 2:30ae917c0e4f "C" rebasing 2:30ae917c0e4f "C"
merging a merging a
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob)
$ hg tglog $ hg tglog
o 3: 'C' o 3: 25773bc4b4b0 'C'
| |
o 2: 'B' o 2: c09015405f75 'B'
| |
@ 1: 'AD' @ 1: 3878212183bd 'AD'
| |
o 0: 'A' o 0: 1e635d440a73 'A'
$ cd .. $ cd ..
Test rebasing of merges with ancestors of the rebase destination - a situation Test rebasing of merges with ancestors of the rebase destination - a situation
that often happens when trying to recover from repeated merging with a mainline that often happens when trying to recover from repeated merging with a mainline
branch. branch.
$ hg merge -q default $ hg merge -q default
$ hg ci -m 'dev: merge default' $ hg ci -m 'dev: merge default'
$ hg up -q default $ hg up -q default
$ echo stuff > f-other $ echo stuff > f-other
$ hg ci -Aqm 'default: f-other stuff' $ hg ci -Aqm 'default: f-other stuff'
$ hg tglog $ hg tglog
@ 7: 'default: f-other stuff' @ 7: e08089805d82 'default: f-other stuff'
| |
| o 6: 'dev: merge default' dev | o 6: 9455ee510502 'dev: merge default' dev
|/| |/|
o | 5: 'default: remove f-default' o | 5: 462860db70a1 'default: remove f-default'
| | | |
| o 4: 'dev: merge default' dev | o 4: 4b019212aaf6 'dev: merge default' dev
|/| |/|
o | 3: 'default: f-default stuff' o | 3: f157ecfd2b6b 'default: f-default stuff'
| | | |
| o 2: 'dev: f-dev stuff' dev | o 2: ec2c14fb2984 'dev: f-dev stuff' dev
| | | |
| o 1: 'dev: create branch' dev | o 1: 1d1a643d390e 'dev: create branch' dev
|/ |/
o 0: 'default: create f-default' o 0: e90e8eb90b6f 'default: create f-default'
$ hg clone -qU . ../ancestor-merge-2 $ hg clone -qU . ../ancestor-merge-2
Full rebase all the way back from branching point: Full rebase all the way back from branching point:
$ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 1:1d1a643d390e "dev: create branch" rebasing 1:1d1a643d390e "dev: create branch"
note: rebase of 1:1d1a643d390e created no changes to commit note: rebase of 1:1d1a643d390e created no changes to commit
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
other [source] changed f-default which local [dest] deleted other [source] changed f-default which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob) saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'dev: merge default' o 6: fbc098e72227 'dev: merge default'
| |
o 5: 'dev: merge default' o 5: eda7b7f46f5d 'dev: merge default'
| |
o 4: 'dev: f-dev stuff' o 4: 3e075b1c0a40 'dev: f-dev stuff'
| |
@ 3: 'default: f-other stuff' @ 3: e08089805d82 'default: f-other stuff'
| |
o 2: 'default: remove f-default' o 2: 462860db70a1 'default: remove f-default'
| |
o 1: 'default: f-default stuff' o 1: f157ecfd2b6b 'default: f-default stuff'
| |
o 0: 'default: create f-default' o 0: e90e8eb90b6f 'default: create f-default'
Grafty cherry picking rebasing: Grafty cherry picking rebasing:
$ cd ../ancestor-merge-2 $ cd ../ancestor-merge-2
$ hg phase -fdr0: $ hg phase -fdr0:
$ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
other [source] changed f-default which local [dest] deleted other [source] changed f-default which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob) saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob)
$ hg tglog $ hg tglog
o 7: 'dev: merge default' o 7: fbc098e72227 'dev: merge default'
| |
o 6: 'dev: merge default' o 6: eda7b7f46f5d 'dev: merge default'
| |
o 5: 'dev: f-dev stuff' o 5: 3e075b1c0a40 'dev: f-dev stuff'
| |
o 4: 'default: f-other stuff' o 4: e08089805d82 'default: f-other stuff'
| |
o 3: 'default: remove f-default' o 3: 462860db70a1 'default: remove f-default'
| |
o 2: 'default: f-default stuff' o 2: f157ecfd2b6b 'default: f-default stuff'
| |
| o 1: 'dev: create branch' dev | o 1: 1d1a643d390e 'dev: create branch' dev
|/ |/
o 0: 'default: create f-default' o 0: e90e8eb90b6f 'default: create f-default'
$ cd .. $ cd ..
Test order of parents of rebased merged with un-rebased changes as p1. Test order of parents of rebased merged with un-rebased changes as p1.
$ hg init parentorder $ hg init parentorder
$ cd parentorder $ cd parentorder
tag: tip tag: tip
parent: 1:dd40c13f7a6f parent: 1:dd40c13f7a6f
parent: 3:f59da8fc0fcf parent: 3:f59da8fc0fcf
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge p1 1=ancestor p2 3=outside summary: merge p1 1=ancestor p2 3=outside
$ hg tglog $ hg tglog
@ 5: 'merge p1 1=ancestor p2 3=outside' @ 5: a57575f79074 'merge p1 1=ancestor p2 3=outside'
|\ |\
+---o 4: 'merge p1 3=outside p2 1=ancestor' +---o 4: 6990226659be 'merge p1 3=outside p2 1=ancestor'
| |/ | |/
| o 3: 'outside' | o 3: f59da8fc0fcf 'outside'
| | | |
+---o 2: 'target' +---o 2: a60552eb93fb 'target'
| | | |
o | 1: 'change' o | 1: dd40c13f7a6f 'change'
|/ |/
o 0: 'common' o 0: 02f0f58d5300 'common'
$ hg rebase -r 4 -d 2 $ hg rebase -r 4 -d 2
rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob) saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob)
$ hg tip $ hg tip
changeset: 5:cca50676b1c5 changeset: 5:cca50676b1c5
tag: tip tag: tip
parent: 2:a60552eb93fb parent: 2:a60552eb93fb
tag: tip tag: tip
parent: 2:a60552eb93fb parent: 2:a60552eb93fb
parent: 3:f59da8fc0fcf parent: 3:f59da8fc0fcf
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge p1 1=ancestor p2 3=outside summary: merge p1 1=ancestor p2 3=outside
$ hg tglog $ hg tglog
@ 5: 'merge p1 1=ancestor p2 3=outside' @ 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside'
|\ |\
+---o 4: 'merge p1 3=outside p2 1=ancestor' +---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor'
| |/ | |/
| o 3: 'outside' | o 3: f59da8fc0fcf 'outside'
| | | |
o | 2: 'target' o | 2: a60552eb93fb 'target'
| | | |
o | 1: 'change' o | 1: dd40c13f7a6f 'change'
|/ |/
o 0: 'common' o 0: 02f0f58d5300 'common'
rebase of merge of ancestors rebase of merge of ancestors
$ hg up -qr 2 $ hg up -qr 2
$ hg merge -qr 3 $ hg merge -qr 3
$ echo 'other change while merging future "rebase ancestors"' > other $ echo 'other change while merging future "rebase ancestors"' > other
$ hg ci -Aqm 'merge rebase ancestors' $ hg ci -Aqm 'merge rebase ancestors'
$ hg rebase -d 5 -v $ hg rebase -d 5 -v
182 other 182 other
adding branch adding branch
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
rebase completed rebase completed
$ hg tglog $ hg tglog
@ 6: 'merge rebase ancestors' @ 6: 113755df812b 'merge rebase ancestors'
| |
o 5: 'merge p1 1=ancestor p2 3=outside' o 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside'
|\ |\
+---o 4: 'merge p1 3=outside p2 1=ancestor' +---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor'
| |/ | |/
| o 3: 'outside' | o 3: f59da8fc0fcf 'outside'
| | | |
o | 2: 'target' o | 2: a60552eb93fb 'target'
| | | |
o | 1: 'change' o | 1: dd40c13f7a6f 'change'
|/ |/
o 0: 'common' o 0: 02f0f58d5300 'common'
Due to the limitation of 3-way merge algorithm (1 merge base), rebasing a merge Due to the limitation of 3-way merge algorithm (1 merge base), rebasing a merge
may include unwanted content: may include unwanted content:
$ hg init $TESTTMP/dual-merge-base1 $ hg init $TESTTMP/dual-merge-base1
$ cd $TESTTMP/dual-merge-base1 $ cd $TESTTMP/dual-merge-base1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F > F

tests/test-rebase-parameters.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads) added 8 changesets with 7 changes to 7 files (+2 heads)
new changesets cd010b8cd998:02de42196ebe new changesets cd010b8cd998:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip $ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo I > I $ echo I > I
$ hg ci -AmI $ hg ci -AmI
adding I adding I
$ hg tglog $ hg tglog
@ 8: 'I' @ 8: e7ec4e813ba6 'I'
| |
o 7: 'H' o 7: 02de42196ebe 'H'
| |
| o 6: 'G' | o 6: eea13746799a 'G'
|/| |/|
o | 5: 'F' o | 5: 24b6387c8c8c 'F'
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Version with only two heads (to allow default destination to work) Version with only two heads (to allow default destination to work)
$ hg clone -q -u . a a2heads -r 3 -r 8 $ hg clone -q -u . a a2heads -r 3 -r 8
These fail: These fail:
$ hg rebase $ hg rebase
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 6: 'D' @ 6: ed65089c18f8 'D'
| |
o 5: 'C' o 5: 7621bf1a2f17 'C'
| |
o 4: 'B' o 4: 9430a62369c6 'B'
| |
o 3: 'I' o 3: e7ec4e813ba6 'I'
| |
o 2: 'H' o 2: 02de42196ebe 'H'
| |
o 1: 'F' o 1: 24b6387c8c8c 'F'
| |
o 0: 'A' o 0: cd010b8cd998 'A'
Try to rollback after a rebase (fail): Try to rollback after a rebase (fail):
$ hg rollback $ hg rollback
no rollback information available no rollback information available
[1] [1]
$ cd .. $ cd ..
Rebase with base == '.' => same as no arguments (from 3 onto 8): Rebase with base == '.' => same as no arguments (from 3 onto 8):
$ hg clone -q -u 3 a2heads a2 $ hg clone -q -u 3 a2heads a2
$ cd a2 $ cd a2
$ hg rebase --base . $ hg rebase --base .
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 6: 'D' @ 6: ed65089c18f8 'D'
| |
o 5: 'C' o 5: 7621bf1a2f17 'C'
| |
o 4: 'B' o 4: 9430a62369c6 'B'
| |
o 3: 'I' o 3: e7ec4e813ba6 'I'
| |
o 2: 'H' o 2: 02de42196ebe 'H'
| |
o 1: 'F' o 1: 24b6387c8c8c 'F'
| |
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
$ hg clone -q -u 3 a a3 $ hg clone -q -u 3 a a3
$ cd a3 $ cd a3
$ hg rebase --dest 'branch(.)' $ hg rebase --dest 'branch(.)'
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 8: 'D' @ 8: ed65089c18f8 'D'
| |
o 7: 'C' o 7: 7621bf1a2f17 'C'
| |
o 6: 'B' o 6: 9430a62369c6 'B'
| |
o 5: 'I' o 5: e7ec4e813ba6 'I'
| |
o 4: 'H' o 4: 02de42196ebe 'H'
| |
| o 3: 'G' | o 3: eea13746799a 'G'
|/| |/|
o | 2: 'F' o | 2: 24b6387c8c8c 'F'
| | | |
| o 1: 'E' | o 1: 9520eea781bc 'E'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify only source (from 2 onto 8): Specify only source (from 2 onto 8):
$ hg clone -q -u . a2heads a4 $ hg clone -q -u . a2heads a4
$ cd a4 $ cd a4
$ hg rebase --source 'desc("C")' $ hg rebase --source 'desc("C")'
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'D' o 6: 7726e9fd58f7 'D'
| |
o 5: 'C' o 5: 72c8333623d0 'C'
| |
@ 4: 'I' @ 4: e7ec4e813ba6 'I'
| |
o 3: 'H' o 3: 02de42196ebe 'H'
| |
o 2: 'F' o 2: 24b6387c8c8c 'F'
| |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify only dest (from 3 onto 6): Specify only dest (from 3 onto 6):
$ hg clone -q -u 3 a a5 $ hg clone -q -u 3 a a5
$ cd a5 $ cd a5
$ hg rebase --dest 6 $ hg rebase --dest 6
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 8: 'D' @ 8: 8eeb3c33ad33 'D'
| |
o 7: 'C' o 7: 2327fea05063 'C'
| |
o 6: 'B' o 6: e4e5be0395b2 'B'
| |
| o 5: 'I' | o 5: e7ec4e813ba6 'I'
| | | |
| o 4: 'H' | o 4: 02de42196ebe 'H'
| | | |
o | 3: 'G' o | 3: eea13746799a 'G'
|\| |\|
| o 2: 'F' | o 2: 24b6387c8c8c 'F'
| | | |
o | 1: 'E' o | 1: 9520eea781bc 'E'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify only base (from 1 onto 8): Specify only base (from 1 onto 8):
$ hg clone -q -u . a2heads a6 $ hg clone -q -u . a2heads a6
$ cd a6 $ cd a6
$ hg rebase --base 'desc("D")' $ hg rebase --base 'desc("D")'
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'D' o 6: ed65089c18f8 'D'
| |
o 5: 'C' o 5: 7621bf1a2f17 'C'
| |
o 4: 'B' o 4: 9430a62369c6 'B'
| |
@ 3: 'I' @ 3: e7ec4e813ba6 'I'
| |
o 2: 'H' o 2: 02de42196ebe 'H'
| |
o 1: 'F' o 1: 24b6387c8c8c 'F'
| |
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify source and dest (from 2 onto 7): Specify source and dest (from 2 onto 7):
$ hg clone -q -u . a a7 $ hg clone -q -u . a a7
$ cd a7 $ cd a7
$ hg rebase --source 2 --dest 7 $ hg rebase --source 2 --dest 7
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'D' o 8: 668acadedd30 'D'
| |
o 7: 'C' o 7: 09eb682ba906 'C'
| |
| @ 6: 'I' | @ 6: e7ec4e813ba6 'I'
|/ |/
o 5: 'H' o 5: 02de42196ebe 'H'
| |
| o 4: 'G' | o 4: eea13746799a 'G'
|/| |/|
o | 3: 'F' o | 3: 24b6387c8c8c 'F'
| | | |
| o 2: 'E' | o 2: 9520eea781bc 'E'
|/ |/
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify base and dest (from 1 onto 7): Specify base and dest (from 1 onto 7):
$ hg clone -q -u . a a8 $ hg clone -q -u . a a8
$ cd a8 $ cd a8
$ hg rebase --base 3 --dest 7 $ hg rebase --base 3 --dest 7
rebasing 1:42ccdea3bb16 "B" rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'D' o 8: 287cc92ba5a4 'D'
| |
o 7: 'C' o 7: 6824f610a250 'C'
| |
o 6: 'B' o 6: 7c6027df6a99 'B'
| |
| @ 5: 'I' | @ 5: e7ec4e813ba6 'I'
|/ |/
o 4: 'H' o 4: 02de42196ebe 'H'
| |
| o 3: 'G' | o 3: eea13746799a 'G'
|/| |/|
o | 2: 'F' o | 2: 24b6387c8c8c 'F'
| | | |
| o 1: 'E' | o 1: 9520eea781bc 'E'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Specify only revs (from 2 onto 8) Specify only revs (from 2 onto 8)
$ hg clone -q -u . a2heads a9 $ hg clone -q -u . a2heads a9
$ cd a9 $ cd a9
$ hg rebase --rev 'desc("C")::' $ hg rebase --rev 'desc("C")::'
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'D' o 6: 7726e9fd58f7 'D'
| |
o 5: 'C' o 5: 72c8333623d0 'C'
| |
@ 4: 'I' @ 4: e7ec4e813ba6 'I'
| |
o 3: 'H' o 3: 02de42196ebe 'H'
| |
o 2: 'F' o 2: 24b6387c8c8c 'F'
| |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
Rebasing both a single revision and a merge in one command Rebasing both a single revision and a merge in one command
$ hg clone -q -u . a aX $ hg clone -q -u . a aX
$ cd aX $ cd aX
$ hg rebase -r 3 -r 6 --dest 8 $ hg rebase -r 3 -r 6 --dest 8

tests/test-rebase-partial.t

Tests rebasing with part of the rebase set already in the Tests rebasing with part of the rebase set already in the
destination (issue5422) destination (issue5422)
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> >
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: {desc}" > tglog = log -G --template "{rev}: {node|short} {desc}"
> EOF > EOF
$ rebasewithdag() { $ rebasewithdag() {
> N=`$PYTHON -c "print($N+1)"` > N=`$PYTHON -c "print($N+1)"`
> hg init repo$N && cd repo$N > hg init repo$N && cd repo$N
> hg debugdrawdag > hg debugdrawdag
> hg rebase "$@" > _rebasetmp > hg rebase "$@" > _rebasetmp
> r=$? > r=$?
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 "D" (D)
already rebased 3:26805aba1e60 "C" (C tip) already rebased 3:26805aba1e60 "C" (C tip)
o 4: D o 4: fe3b4c6498fa D
| |
| o 3: C | o 3: 26805aba1e60 C
|/ |/
| x 2: D | x 2: b18e25de2cf5 D
| | | |
o | 1: B o | 1: 112478962961 B
|/ |/
o 0: A o 0: 426bada5c675 A
Can collapse commits even if one is already in the right place Can collapse commits even if one is already in the right place
$ rebasewithdag --collapse -r C+D -d B <<EOF $ rebasewithdag --collapse -r C+D -d B <<EOF
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:b18e25de2cf5 "D" (D)
rebasing 3:26805aba1e60 "C" (C tip) rebasing 3:26805aba1e60 "C" (C tip)
o 4: Collapsed revision o 4: a2493f4ace65 Collapsed revision
| * D | * D
| * C | * C
| x 3: C | x 3: 26805aba1e60 C
|/ |/
| x 2: D | x 2: b18e25de2cf5 D
| | | |
o | 1: B o | 1: 112478962961 B
|/ |/
o 0: A o 0: 426bada5c675 A
Rebase with "holes". The commits after the hole should end up on the parent of Rebase with "holes". The commits after the hole should end up on the parent of
the hole (B below), not on top of the destination (A). the hole (B below), not on top of the destination (A).
$ rebasewithdag -r B+D -d A <<EOF $ rebasewithdag -r B+D -d A <<EOF
> D > D
> | > |
> C > C
> | > |
> B > B
> | > |
> A > A
> EOF > EOF
already rebased 1:112478962961 "B" (B) already rebased 1:112478962961 "B" (B)
rebasing 3:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 "D" (D tip)
o 4: D o 4: 1e6da8103bc7 D
| |
| x 3: D | x 3: f585351a92f8 D
| | | |
| o 2: C | o 2: 26805aba1e60 C
|/ |/
o 1: B o 1: 112478962961 B
| |
o 0: A o 0: 426bada5c675 A

tests/test-rebase-pull.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> histedit= > histedit=
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ echo C1 > C1 $ echo C1 > C1
$ hg ci -Am C1 $ hg ci -Am C1
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 77ae9631bcca new changesets 77ae9631bcca
rebasing 2:ff8d69a621f9 "L1" rebasing 2:ff8d69a621f9 "L1"
saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'L1' @ 3: d80cc2da061e 'L1'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
Re-run: Re-run:
$ hg pull --rebase $ hg pull --rebase
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
no changes found no changes found
$ hg histedit --abort --quiet $ hg histedit --abort --quiet
Abort pull early with pending uncommitted merge: Abort pull early with pending uncommitted merge:
$ cd .. $ cd ..
$ hg clone --noupdate c d $ hg clone --noupdate c d
$ cd d $ cd d
$ hg tglog $ hg tglog
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
$ hg update --quiet 0 $ hg update --quiet 0
$ echo M1 > M1 $ echo M1 > M1
$ hg commit --quiet -Am M1 $ hg commit --quiet -Am M1
$ hg update --quiet 1 $ hg update --quiet 1
$ hg merge 2 $ hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 77ae9631bcca new changesets 77ae9631bcca
nothing to rebase - updating instead nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark norebase updating bookmark norebase
$ hg tglog -l 1 $ hg tglog -l 1
@ 2: 'R1' @ 2: 77ae9631bcca 'R1'
| |
~ ~
pull --rebase --update should ignore --update: pull --rebase --update should ignore --update:
$ hg pull --rebase --update $ hg pull --rebase --update
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
no changes found no changes found
pull --rebase doesn't update if nothing has been pulled: pull --rebase doesn't update if nothing has been pulled:
$ hg up -q 1 $ hg up -q 1
$ hg pull --rebase $ hg pull --rebase
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
no changes found no changes found
$ hg tglog -l 1 $ hg tglog -l 1
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
~ ~
$ cd .. $ cd ..
pull --rebase works when a specific revision is pulled (issue3619) pull --rebase works when a specific revision is pulled (issue3619)
$ cd a $ cd a
$ hg tglog $ hg tglog
@ 2: 'R1' @ 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
$ echo R2 > R2 $ echo R2 > R2
$ hg ci -Am R2 $ hg ci -Am R2
adding R2 adding R2
$ echo R3 > R3 $ echo R3 > R3
$ hg ci -Am R3 $ hg ci -Am R3
adding R3 adding R3
$ cd ../c $ cd ../c
$ hg tglog $ hg tglog
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
@ 1: 'C2' @ 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
$ echo L1 > L1 $ echo L1 > L1
$ hg ci -Am L1 $ hg ci -Am L1
adding L1 adding L1
created new head created new head
$ hg pull --rev tip --rebase $ hg pull --rev tip --rebase
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
new changesets 31cd3a05214e:770a61882ace new changesets 31cd3a05214e:770a61882ace
rebasing 3:ff8d69a621f9 "L1" rebasing 3:ff8d69a621f9 "L1"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 5: 'L1' @ 5: 518d153c0ba3 'L1'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
pull --rebase works with bundle2 turned on pull --rebase works with bundle2 turned on
$ cd ../a $ cd ../a
$ echo R4 > R4 $ echo R4 > R4
$ hg ci -Am R4 $ hg ci -Am R4
adding R4 adding R4
$ hg tglog $ hg tglog
@ 5: 'R4' @ 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
$ cd ../c $ cd ../c
$ hg pull --rebase $ hg pull --rebase
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 00e3b7781125 new changesets 00e3b7781125
rebasing 5:518d153c0ba3 "L1" rebasing 5:518d153c0ba3 "L1"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 6: 'L1' @ 6: 0d0727eb7ce0 'L1'
| |
o 5: 'R4' o 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
pull --rebase only update if there is nothing to rebase pull --rebase only update if there is nothing to rebase
$ cd ../a $ cd ../a
$ echo R5 > R5 $ echo R5 > R5
$ hg ci -Am R5 $ hg ci -Am R5
adding R5 adding R5
$ hg tglog $ hg tglog
@ 6: 'R5' @ 6: 88dd24261747 'R5'
| |
o 5: 'R4' o 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
$ cd ../c $ cd ../c
$ echo L2 > L2 $ echo L2 > L2
$ hg ci -Am L2 $ hg ci -Am L2
adding L2 adding L2
$ hg up 'desc(L1)' $ hg up 'desc(L1)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pull --rebase $ hg pull --rebase
pulling from $TESTTMP/a (glob) pulling from $TESTTMP/a (glob)
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 88dd24261747 new changesets 88dd24261747
rebasing 6:0d0727eb7ce0 "L1" rebasing 6:0d0727eb7ce0 "L1"
rebasing 7:c1f58876e3bf "L2" rebasing 7:c1f58876e3bf "L2"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'L2' o 8: 6dc0ea5dcf55 'L2'
| |
@ 7: 'L1' @ 7: 864e0a2d2614 'L1'
| |
o 6: 'R5' o 6: 88dd24261747 'R5'
| |
o 5: 'R4' o 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
pull --rebase update (no rebase) use proper update: pull --rebase update (no rebase) use proper update:
- warn about other head. - warn about other head.
$ cd ../a $ cd ../a
$ echo R6 > R6 $ echo R6 > R6
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 65bc164c1d9b new changesets 65bc164c1d9b
nothing to rebase - updating instead nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "65bc164c1d9b: R6" updated to "65bc164c1d9b: R6"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg tglog $ hg tglog
@ 9: 'R6' @ 9: 65bc164c1d9b 'R6'
| |
| o 8: 'L2' | o 8: 6dc0ea5dcf55 'L2'
| | | |
| o 7: 'L1' | o 7: 864e0a2d2614 'L1'
|/ |/
o 6: 'R5' o 6: 88dd24261747 'R5'
| |
o 5: 'R4' o 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'
Multiple pre-existing heads on the branch Multiple pre-existing heads on the branch
----------------------------------------- -----------------------------------------
Pull bring content, but nothing on the current branch, we should not consider Pull bring content, but nothing on the current branch, we should not consider
pre-existing heads. pre-existing heads.
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets f7d3e42052f9 new changesets f7d3e42052f9
rebasing 7:864e0a2d2614 "L1" rebasing 7:864e0a2d2614 "L1"
rebasing 8:6dc0ea5dcf55 "L2" rebasing 8:6dc0ea5dcf55 "L2"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 12: 'L2' @ 12: 3603a865eea0 'L2'
| |
o 11: 'L1' o 11: bcc8a9cd04bf 'L1'
| |
o 10: 'R7' o 10: f7d3e42052f9 'R7'
| |
| o 9: 'M1' | o 9: 41fab4eef82f 'M1'
|/ |/
| o 8: 'B1' unrelatedbranch | o 8: 39c381359968 'B1' unrelatedbranch
|/ |/
o 7: 'R6' o 7: 65bc164c1d9b 'R6'
| |
o 6: 'R5' o 6: 88dd24261747 'R5'
| |
o 5: 'R4' o 5: 00e3b7781125 'R4'
| |
o 4: 'R3' o 4: 770a61882ace 'R3'
| |
o 3: 'R2' o 3: 31cd3a05214e 'R2'
| |
o 2: 'R1' o 2: 77ae9631bcca 'R1'
| |
o 1: 'C2' o 1: 783333faa078 'C2'
| |
o 0: 'C1' o 0: 05d58a0c15dd 'C1'

tests/test-rebase-rename.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [alias] > [alias]
> tlog = log --template "{rev}: '{desc}' {branches}\n" > tlog = log --template "{rev}: {node|short} '{desc}' {branches}\n"
> tglog = tlog --graph > tglog = tlog --graph
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ mkdir d $ mkdir d
$ hg mv a a-renamed $ hg mv a a-renamed
$ echo x > d/x $ echo x > d/x
$ hg add d/x $ hg add d/x
$ hg ci -m 'rename A' $ hg ci -m 'rename A'
created new head created new head
$ hg tglog $ hg tglog
@ 3: 'rename A' @ 3: 73a3ee40125d 'rename A'
| |
| o 2: 'rename B' | o 2: 220d0626d185 'rename B'
|/ |/
o 1: 'B' o 1: 3ab5da9a5c01 'B'
| |
o 0: 'A' o 0: 1994f17a630e 'A'
Rename is tracked: Rename is tracked:
$ hg tlog -p --git -r tip $ hg tlog -p --git -r tip
3: 'rename A' 3: 73a3ee40125d 'rename A'
diff --git a/a b/a-renamed diff --git a/a b/a-renamed
rename from a rename from a
rename to a-renamed rename to a-renamed
diff --git a/d/x b/d/x diff --git a/d/x b/d/x
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/d/x +++ b/d/x
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+x +x
Rebase the revision containing the rename: Rebase the revision containing the rename:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:73a3ee40125d "rename A" (tip) rebasing 3:73a3ee40125d "rename A" (tip)
saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob) saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'rename A' @ 3: 032a9b75e83b 'rename A'
| |
o 2: 'rename B' o 2: 220d0626d185 'rename B'
| |
o 1: 'B' o 1: 3ab5da9a5c01 'B'
| |
o 0: 'A' o 0: 1994f17a630e 'A'
Rename is not lost: Rename is not lost:
$ hg tlog -p --git -r tip $ hg tlog -p --git -r tip
3: 'rename A' 3: 032a9b75e83b 'rename A'
diff --git a/a b/a-renamed diff --git a/a b/a-renamed
rename from a rename from a
rename to a-renamed rename to a-renamed
diff --git a/d-renamed/x b/d-renamed/x diff --git a/d-renamed/x b/d-renamed/x
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/d-renamed/x +++ b/d-renamed/x
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
$ hg up -q -C 1 $ hg up -q -C 1
$ hg cp a a-copied $ hg cp a a-copied
$ hg ci -m 'copy A' $ hg ci -m 'copy A'
created new head created new head
$ hg tglog $ hg tglog
@ 3: 'copy A' @ 3: 0a8162ff18a8 'copy A'
| |
| o 2: 'copy B' | o 2: 39e588434882 'copy B'
|/ |/
o 1: 'B' o 1: 6c81ed0049f8 'B'
| |
o 0: 'A' o 0: 1994f17a630e 'A'
Copy is tracked: Copy is tracked:
$ hg tlog -p --git -r tip $ hg tlog -p --git -r tip
3: 'copy A' 3: 0a8162ff18a8 'copy A'
diff --git a/a b/a-copied diff --git a/a b/a-copied
copy from a copy from a
copy to a-copied copy to a-copied
Rebase the revision containing the copy: Rebase the revision containing the copy:
$ hg rebase -s 3 -d 2 $ hg rebase -s 3 -d 2
rebasing 3:0a8162ff18a8 "copy A" (tip) rebasing 3:0a8162ff18a8 "copy A" (tip)
saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob) saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 3: 'copy A' @ 3: 98f6e6dbf45a 'copy A'
| |
o 2: 'copy B' o 2: 39e588434882 'copy B'
| |
o 1: 'B' o 1: 6c81ed0049f8 'B'
| |
o 0: 'A' o 0: 1994f17a630e 'A'
Copy is not lost: Copy is not lost:
$ hg tlog -p --git -r tip $ hg tlog -p --git -r tip
3: 'copy A' 3: 98f6e6dbf45a 'copy A'
diff --git a/a b/a-copied diff --git a/a b/a-copied
copy from a copy from a
copy to a-copied copy to a-copied
Rebased revision does not contain information about b (issue3739) Rebased revision does not contain information about b (issue3739)
$ hg log -r 3 --debug $ hg log -r 3 --debug
$ hg update -r -2 $ hg update -r -2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo Another unrelated change >> unrelated.txt $ echo Another unrelated change >> unrelated.txt
$ hg ci -m "Another unrelated change" $ hg ci -m "Another unrelated change"
created new head created new head
$ hg tglog $ hg tglog
@ 4: 'Another unrelated change' @ 4: b918d683b091 'Another unrelated change'
| |
| o 3: 'Rename file2 back to file1' | o 3: 1ac17e43d8aa 'Rename file2 back to file1'
|/ |/
o 2: 'Unrelated change' o 2: 480101d66d8d 'Unrelated change'
| |
o 1: 'Rename file1 to file2' o 1: be44c61debd2 'Rename file1 to file2'
| |
o 0: 'Adding file1' o 0: 8ce9a346991d 'Adding file1'
$ hg rebase -s 4 -d 3 $ hg rebase -s 4 -d 3
rebasing 4:b918d683b091 "Another unrelated change" (tip) rebasing 4:b918d683b091 "Another unrelated change" (tip)
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg (glob)
$ hg diff --stat -c . $ hg diff --stat -c .
unrelated.txt | 1 + unrelated.txt | 1 +
$ echo c > c $ echo c > c
$ hg commit --message "File c created as copy of b and modified" $ hg commit --message "File c created as copy of b and modified"
$ hg copy c d $ hg copy c d
$ echo d > d $ echo d > d
$ hg commit --message "File d created as copy of c and modified" $ hg commit --message "File d created as copy of c and modified"
Note that there are four entries in the log for d Note that there are four entries in the log for d
$ hg tglog --follow d $ hg tglog --follow d
@ 3: 'File d created as copy of c and modified' @ 3: 421b7e82bb85 'File d created as copy of c and modified'
| |
o 2: 'File c created as copy of b and modified' o 2: 327f772bc074 'File c created as copy of b and modified'
| |
o 1: 'File b created as copy of a and modified' o 1: 79d255d24ad2 'File b created as copy of a and modified'
| |
o 0: 'File a created' o 0: b220cd6d2326 'File a created'
Update back to before we performed copies, and inject an unrelated change. Update back to before we performed copies, and inject an unrelated change.
$ hg update 0 $ hg update 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo unrelated > unrelated $ echo unrelated > unrelated
$ hg add unrelated $ hg add unrelated
$ hg commit --message "Unrelated file created" $ hg commit --message "Unrelated file created"
created new head created new head
$ hg update 4 $ hg update 4
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Rebase the copies on top of the unrelated change. Rebase the copies on top of the unrelated change.
$ hg rebase --source 1 --dest 4 $ hg rebase --source 1 --dest 4
rebasing 1:79d255d24ad2 "File b created as copy of a and modified" rebasing 1:79d255d24ad2 "File b created as copy of a and modified"
rebasing 2:327f772bc074 "File c created as copy of b and modified" rebasing 2:327f772bc074 "File c created as copy of b and modified"
rebasing 3:421b7e82bb85 "File d created as copy of c and modified" rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg (glob) saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg (glob)
$ hg update 4 $ hg update 4
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
There should still be four entries in the log for d There should still be four entries in the log for d
$ hg tglog --follow d $ hg tglog --follow d
@ 4: 'File d created as copy of c and modified' @ 4: dbb9ba033561 'File d created as copy of c and modified'
| |
o 3: 'File c created as copy of b and modified' o 3: af74b229bc02 'File c created as copy of b and modified'
| |
o 2: 'File b created as copy of a and modified' o 2: 68bf06433839 'File b created as copy of a and modified'
: :
o 0: 'File a created' o 0: b220cd6d2326 'File a created'
Same steps as above, but with --collapse on rebase to make sure the Same steps as above, but with --collapse on rebase to make sure the
copy records collapse correctly. copy records collapse correctly.
$ hg co 1 $ hg co 1
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo more >> unrelated $ echo more >> unrelated
$ hg ci -m 'unrelated commit is unrelated' $ hg ci -m 'unrelated commit is unrelated'
created new head created new head
$ hg rebase -s 2 --dest 5 --collapse $ hg rebase -s 2 --dest 5 --collapse
rebasing 2:68bf06433839 "File b created as copy of a and modified" rebasing 2:68bf06433839 "File b created as copy of a and modified"
rebasing 3:af74b229bc02 "File c created as copy of b and modified" rebasing 3:af74b229bc02 "File c created as copy of b and modified"
merging b and c to c merging b and c to c
rebasing 4:dbb9ba033561 "File d created as copy of c and modified" rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
merging c and d to d merging c and d to d
saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg (glob) saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg (glob)
$ hg co tip $ hg co tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
This should show both revision 3 and 0 since 'd' was transitively a This should show both revision 3 and 0 since 'd' was transitively a
copy of 'a'. copy of 'a'.
$ hg tglog --follow d $ hg tglog --follow d
@ 3: 'Collapsed revision @ 3: 5a46b94210e5 'Collapsed revision
: * File b created as copy of a and modified : * File b created as copy of a and modified
: * File c created as copy of b and modified : * File c created as copy of b and modified
: * File d created as copy of c and modified' : * File d created as copy of c and modified'
o 0: 'File a created' o 0: b220cd6d2326 'File a created'
$ cd .. $ cd ..

tests/test-rebase-scenario-global.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> >
> [phases] > [phases]
> publish=False > publish=False
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF > EOF
$ hg init a $ hg init a
$ cd a $ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
adding manifests adding manifests
D onto H - simple rebase: D onto H - simple rebase:
(this also tests that editor is invoked if '--edit' is specified, and that we (this also tests that editor is invoked if '--edit' is specified, and that we
can abort or warn for colliding untracked files) can abort or warn for colliding untracked files)
$ hg clone -q -u . a a1 $ hg clone -q -u . a a1
$ cd a1 $ cd a1
$ hg tglog $ hg tglog
@ 7: 'H' @ 7: 02de42196ebe 'H'
| |
| o 6: 'G' | o 6: eea13746799a 'G'
|/| |/|
o | 5: 'F' o | 5: 24b6387c8c8c 'F'
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ hg status --rev "3^1" --rev 3 $ hg status --rev "3^1" --rev 3
A D A D
$ echo collide > D $ echo collide > D
$ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
D: replacing untracked file D: replacing untracked file
D D
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
HG: branch 'default' HG: branch 'default'
HG: added D HG: added D
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ cat D.orig $ cat D.orig
collide collide
$ rm D.orig $ rm D.orig
$ hg tglog $ hg tglog
o 7: 'D' o 7: 1619f02ff7dd 'D'
| |
@ 6: 'H' @ 6: 02de42196ebe 'H'
| |
| o 5: 'G' | o 5: eea13746799a 'G'
|/| |/|
o | 4: 'F' o | 4: 24b6387c8c8c 'F'
| | | |
| o 3: 'E' | o 3: 9520eea781bc 'E'
|/ |/
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
D onto F - intermediate point: D onto F - intermediate point:
(this also tests that editor is not invoked if '--edit' is not specified, and (this also tests that editor is not invoked if '--edit' is not specified, and
that we can ignore for colliding untracked files) that we can ignore for colliding untracked files)
$ hg clone -q -u . a a2 $ hg clone -q -u . a a2
$ cd a2 $ cd a2
$ echo collide > D $ echo collide > D
$ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ cat D.orig $ cat D.orig
collide collide
$ rm D.orig $ rm D.orig
$ hg tglog $ hg tglog
o 7: 'D' o 7: 2107530e74ab 'D'
| |
| @ 6: 'H' | @ 6: 02de42196ebe 'H'
|/ |/
| o 5: 'G' | o 5: eea13746799a 'G'
|/| |/|
o | 4: 'F' o | 4: 24b6387c8c8c 'F'
| | | |
| o 3: 'E' | o 3: 9520eea781bc 'E'
|/ |/
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
E onto H - skip of G: E onto H - skip of G:
(this also tests that we can overwrite untracked files and don't create backups (this also tests that we can overwrite untracked files and don't create backups
if they have the same contents) if they have the same contents)
$ hg clone -q -u . a a3 $ hg clone -q -u . a a3
$ cd a3 $ cd a3
$ hg cat -r 4 E | tee E $ hg cat -r 4 E | tee E
E E
$ hg rebase -s 4 -d 7 $ hg rebase -s 4 -d 7
rebasing 4:9520eea781bc "E" rebasing 4:9520eea781bc "E"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a created no changes to commit note: rebase of 6:eea13746799a created no changes to commit
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)
$ f E.orig $ f E.orig
E.orig: file not found E.orig: file not found
$ hg tglog $ hg tglog
o 6: 'E' o 6: 9f8b8ec77260 'E'
| |
@ 5: 'H' @ 5: 02de42196ebe 'H'
| |
o 4: 'F' o 4: 24b6387c8c8c 'F'
| |
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
F onto E - rebase of a branching point (skip G): F onto E - rebase of a branching point (skip G):
$ hg clone -q -u . a a4 $ hg clone -q -u . a a4
$ cd a4 $ cd a4
$ hg rebase -s 5 -d 4 $ hg rebase -s 5 -d 4
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
note: rebase of 6:eea13746799a created no changes to commit note: rebase of 6:eea13746799a created no changes to commit
rebasing 7:02de42196ebe "H" (tip) rebasing 7:02de42196ebe "H" (tip)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 6: 'H' @ 6: e9240aeaa6ad 'H'
| |
o 5: 'F' o 5: 5d0ccadb6e3e 'F'
| |
o 4: 'E' o 4: 9520eea781bc 'E'
| |
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
G onto H - merged revision having a parent in ancestors of target: G onto H - merged revision having a parent in ancestors of target:
$ hg clone -q -u . a a5 $ hg clone -q -u . a a5
$ cd a5 $ cd a5
$ hg rebase -s 6 -d 7 $ hg rebase -s 6 -d 7
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob)
$ hg tglog $ hg tglog
o 7: 'G' o 7: 397834907a90 'G'
|\ |\
| @ 6: 'H' | @ 6: 02de42196ebe 'H'
| | | |
| o 5: 'F' | o 5: 24b6387c8c8c 'F'
| | | |
o | 4: 'E' o | 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
F onto B - G maintains E as parent: F onto B - G maintains E as parent:
$ hg clone -q -u . a a6 $ hg clone -q -u . a a6
$ cd a6 $ cd a6
$ hg rebase -s 5 -d 1 $ hg rebase -s 5 -d 1
rebasing 5:24b6387c8c8c "F" rebasing 5:24b6387c8c8c "F"
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
rebasing 7:02de42196ebe "H" (tip) rebasing 7:02de42196ebe "H" (tip)
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 7: 'H' @ 7: c87be72f9641 'H'
| |
| o 6: 'G' | o 6: 17badd73d4f1 'G'
|/| |/|
o | 5: 'F' o | 5: 74fb9ed646c4 'F'
| | | |
| o 4: 'E' | o 4: 9520eea781bc 'E'
| | | |
| | o 3: 'D' | | o 3: 32af7686d403 'D'
| | | | | |
+---o 2: 'C' +---o 2: 5fddd98957c8 'C'
| | | |
o | 1: 'B' o | 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
$ cd .. $ cd ..
These will fail (using --source): These will fail (using --source):
G onto F - rebase onto an ancestor: G onto F - rebase onto an ancestor:
C onto A - rebase onto an ancestor: C onto A - rebase onto an ancestor:
$ hg rebase -d 0 -s 2 $ hg rebase -d 0 -s 2
rebasing 2:5fddd98957c8 "C" rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D" rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)
$ hg tglog $ hg tglog
o 7: 'D' o 7: c9659aac0000 'D'
| |
o 6: 'C' o 6: e1c4361dd923 'C'
| |
| @ 5: 'H' | @ 5: 02de42196ebe 'H'
| | | |
| | o 4: 'G' | | o 4: eea13746799a 'G'
| |/| | |/|
| o | 3: 'F' | o | 3: 24b6387c8c8c 'F'
|/ / |/ /
| o 2: 'E' | o 2: 9520eea781bc 'E'
|/ |/
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
Check rebasing public changeset Check rebasing public changeset
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
$ hg rebase -d 0 -b 6 $ hg rebase -d 0 -b 6
nothing to rebase nothing to rebase
[1] [1]
$ hg unbundle "$TESTDIR/bundles/rebase-revset.hg" $ hg unbundle "$TESTDIR/bundles/rebase-revset.hg"
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 9 changes to 9 files (+2 heads) added 9 changesets with 9 changes to 9 files (+2 heads)
new changesets 9ae2ed22e576:479ddb54a924 new changesets 9ae2ed22e576:479ddb54a924
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg tglog $ hg tglog
o 8: 'I' o 8: 479ddb54a924 'I'
| |
o 7: 'H' o 7: 72434a4e60b0 'H'
| |
o 6: 'G' o 6: 3d8a618087a7 'G'
| |
| o 5: 'F' | o 5: 41bfcc75ed73 'F'
| | | |
| o 4: 'E' | o 4: c01897464e7f 'E'
|/ |/
o 3: 'D' o 3: ffd453c31098 'D'
| |
o 2: 'C' o 2: c9e50f6cdc55 'C'
| |
| o 1: 'B' | o 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
Simple case with keep: Simple case with keep:
Source on have two descendant heads but ask for one Source on have two descendant heads but ask for one
$ hg clone -q -u . ah ah1 $ hg clone -q -u . ah ah1
$ cd ah1 $ cd ah1
$ hg rebase -r '2::8' -d 1 $ hg rebase -r '2::8' -d 1
abort: can't remove original changesets with unrebased descendants abort: can't remove original changesets with unrebased descendants
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '2::8' -d 1 -k $ hg rebase -r '2::8' -d 1 -k
rebasing 2:c9e50f6cdc55 "C" rebasing 2:c9e50f6cdc55 "C"
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
$ hg tglog $ hg tglog
o 13: 'I' o 13: 9bf1d9358a90 'I'
| |
o 12: 'H' o 12: 274623a778d4 'H'
| |
o 11: 'G' o 11: ab8c8617c8e8 'G'
| |
o 10: 'D' o 10: c8cbf59f70da 'D'
| |
o 9: 'C' o 9: 563e4faab485 'C'
| |
| o 8: 'I' | o 8: 479ddb54a924 'I'
| | | |
| o 7: 'H' | o 7: 72434a4e60b0 'H'
| | | |
| o 6: 'G' | o 6: 3d8a618087a7 'G'
| | | |
| | o 5: 'F' | | o 5: 41bfcc75ed73 'F'
| | | | | |
| | o 4: 'E' | | o 4: c01897464e7f 'E'
| |/ | |/
| o 3: 'D' | o 3: ffd453c31098 'D'
| | | |
| o 2: 'C' | o 2: c9e50f6cdc55 'C'
| | | |
o | 1: 'B' o | 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
Base on have one descendant heads we ask for but common ancestor have two Base on have one descendant heads we ask for but common ancestor have two
$ hg clone -q -u . ah ah2 $ hg clone -q -u . ah ah2
$ cd ah2 $ cd ah2
$ hg rebase -r '3::8' -d 1 $ hg rebase -r '3::8' -d 1
abort: can't remove original changesets with unrebased descendants abort: can't remove original changesets with unrebased descendants
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::8' -d 1 --keep $ hg rebase -r '3::8' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
$ hg tglog $ hg tglog
o 12: 'I' o 12: 9d7da0053b1c 'I'
| |
o 11: 'H' o 11: 8fbd00952cbc 'H'
| |
o 10: 'G' o 10: 51d434a615ee 'G'
| |
o 9: 'D' o 9: a9c125634b0b 'D'
| |
| o 8: 'I' | o 8: 479ddb54a924 'I'
| | | |
| o 7: 'H' | o 7: 72434a4e60b0 'H'
| | | |
| o 6: 'G' | o 6: 3d8a618087a7 'G'
| | | |
| | o 5: 'F' | | o 5: 41bfcc75ed73 'F'
| | | | | |
| | o 4: 'E' | | o 4: c01897464e7f 'E'
| |/ | |/
| o 3: 'D' | o 3: ffd453c31098 'D'
| | | |
| o 2: 'C' | o 2: c9e50f6cdc55 'C'
| | | |
o | 1: 'B' o | 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
rebase subset rebase subset
$ hg clone -q -u . ah ah3 $ hg clone -q -u . ah ah3
$ cd ah3 $ cd ah3
$ hg rebase -r '3::7' -d 1 $ hg rebase -r '3::7' -d 1
abort: can't remove original changesets with unrebased descendants abort: can't remove original changesets with unrebased descendants
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::7' -d 1 --keep $ hg rebase -r '3::7' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
$ hg tglog $ hg tglog
o 11: 'H' o 11: 8fbd00952cbc 'H'
| |
o 10: 'G' o 10: 51d434a615ee 'G'
| |
o 9: 'D' o 9: a9c125634b0b 'D'
| |
| o 8: 'I' | o 8: 479ddb54a924 'I'
| | | |
| o 7: 'H' | o 7: 72434a4e60b0 'H'
| | | |
| o 6: 'G' | o 6: 3d8a618087a7 'G'
| | | |
| | o 5: 'F' | | o 5: 41bfcc75ed73 'F'
| | | | | |
| | o 4: 'E' | | o 4: c01897464e7f 'E'
| |/ | |/
| o 3: 'D' | o 3: ffd453c31098 'D'
| | | |
| o 2: 'C' | o 2: c9e50f6cdc55 'C'
| | | |
o | 1: 'B' o | 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
rebase subset with multiple head rebase subset with multiple head
$ hg clone -q -u . ah ah4 $ hg clone -q -u . ah ah4
$ cd ah4 $ cd ah4
$ hg rebase -r '3::(7+5)' -d 1 $ hg rebase -r '3::(7+5)' -d 1
abort: can't remove original changesets with unrebased descendants abort: can't remove original changesets with unrebased descendants
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::(7+5)' -d 1 --keep $ hg rebase -r '3::(7+5)' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 4:c01897464e7f "E" rebasing 4:c01897464e7f "E"
rebasing 5:41bfcc75ed73 "F" rebasing 5:41bfcc75ed73 "F"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
$ hg tglog $ hg tglog
o 13: 'H' o 13: 8fbd00952cbc 'H'
| |
o 12: 'G' o 12: 51d434a615ee 'G'
| |
| o 11: 'F' | o 11: df23d8bda0b7 'F'
| | | |
| o 10: 'E' | o 10: 47b7889448ff 'E'
|/ |/
o 9: 'D' o 9: a9c125634b0b 'D'
| |
| o 8: 'I' | o 8: 479ddb54a924 'I'
| | | |
| o 7: 'H' | o 7: 72434a4e60b0 'H'
| | | |
| o 6: 'G' | o 6: 3d8a618087a7 'G'
| | | |
| | o 5: 'F' | | o 5: 41bfcc75ed73 'F'
| | | | | |
| | o 4: 'E' | | o 4: c01897464e7f 'E'
| |/ | |/
| o 3: 'D' | o 3: ffd453c31098 'D'
| | | |
| o 2: 'C' | o 2: c9e50f6cdc55 'C'
| | | |
o | 1: 'B' o | 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
More advanced tests More advanced tests
rebase on ancestor with revset rebase on ancestor with revset
$ hg clone -q -u . ah ah5 $ hg clone -q -u . ah ah5
$ cd ah5 $ cd ah5
$ hg rebase -r '6::' -d 2 $ hg rebase -r '6::' -d 2
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob) saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'I' o 8: fcb52e68a694 'I'
| |
o 7: 'H' o 7: 77bd65cd7600 'H'
| |
o 6: 'G' o 6: 12d0e738fb18 'G'
| |
| o 5: 'F' | o 5: 41bfcc75ed73 'F'
| | | |
| o 4: 'E' | o 4: c01897464e7f 'E'
| | | |
| o 3: 'D' | o 3: ffd453c31098 'D'
|/ |/
o 2: 'C' o 2: c9e50f6cdc55 'C'
| |
| o 1: 'B' | o 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
rebase with multiple root. rebase with multiple root.
We rebase E and G on B We rebase E and G on B
We would expect heads are I, F if it was supported We would expect heads are I, F if it was supported
$ hg clone -q -u . ah ah6 $ hg clone -q -u . ah ah6
$ cd ah6 $ cd ah6
$ hg rebase -r '(4+6)::' -d 1 $ hg rebase -r '(4+6)::' -d 1
rebasing 4:c01897464e7f "E" rebasing 4:c01897464e7f "E"
rebasing 5:41bfcc75ed73 "F" rebasing 5:41bfcc75ed73 "F"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob) saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'I' o 8: 9136df9a87cf 'I'
| |
o 7: 'H' o 7: 23e8f30da832 'H'
| |
o 6: 'G' o 6: b0efe8534e8b 'G'
| |
| o 5: 'F' | o 5: 6eb5b496ab79 'F'
| | | |
| o 4: 'E' | o 4: d15eade9b0b1 'E'
|/ |/
| o 3: 'D' | o 3: ffd453c31098 'D'
| | | |
| o 2: 'C' | o 2: c9e50f6cdc55 'C'
| | | |
o | 1: 'B' o | 1: 8fd0f7e49f53 'B'
|/ |/
o 0: 'A' o 0: 9ae2ed22e576 'A'
$ cd .. $ cd ..
More complex rebase with multiple roots More complex rebase with multiple roots
each root have a different common ancestor with the destination and this is a detach each root have a different common ancestor with the destination and this is a detach
(setup) (setup)
$ hg clone -q -u . a a8 $ hg clone -q -u . a a8
$ cd a8 $ cd a8
$ echo I > I $ echo I > I
$ hg add I $ hg add I
$ hg commit -m I $ hg commit -m I
$ hg up 4 $ hg up 4
1 files updated, 0 files merged, 3 files removed, 0 files unresolved 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo I > J $ echo I > J
$ hg add J $ hg add J
$ hg commit -m J $ hg commit -m J
created new head created new head
$ echo I > K $ echo I > K
$ hg add K $ hg add K
$ hg commit -m K $ hg commit -m K
$ hg tglog $ hg tglog
@ 10: 'K' @ 10: 23a4ace37988 'K'
| |
o 9: 'J' o 9: 1301922eeb0c 'J'
| |
| o 8: 'I' | o 8: e7ec4e813ba6 'I'
| | | |
| o 7: 'H' | o 7: 02de42196ebe 'H'
| | | |
+---o 6: 'G' +---o 6: eea13746799a 'G'
| |/ | |/
| o 5: 'F' | o 5: 24b6387c8c8c 'F'
| | | |
o | 4: 'E' o | 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
(actual test) (actual test)
$ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
rebasing 8:e7ec4e813ba6 "I" rebasing 8:e7ec4e813ba6 "I"
rebasing 10:23a4ace37988 "K" (tip) rebasing 10:23a4ace37988 "K" (tip)
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg (glob) saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg (glob)
$ hg log --rev 'children(desc(G))' $ hg log --rev 'children(desc(G))'
changeset: 9:adb617877056 changeset: 9:adb617877056
parent: 6:eea13746799a parent: 6:eea13746799a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: I summary: I
changeset: 10:882431a34a0e changeset: 10:882431a34a0e
tag: tip tag: tip
parent: 6:eea13746799a parent: 6:eea13746799a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: K summary: K
$ hg tglog $ hg tglog
@ 10: 'K' @ 10: 882431a34a0e 'K'
| |
| o 9: 'I' | o 9: adb617877056 'I'
|/ |/
| o 8: 'J' | o 8: 1301922eeb0c 'J'
| | | |
| | o 7: 'H' | | o 7: 02de42196ebe 'H'
| | | | | |
o---+ 6: 'G' o---+ 6: eea13746799a 'G'
|/ / |/ /
| o 5: 'F' | o 5: 24b6387c8c8c 'F'
| | | |
o | 4: 'E' o | 4: 9520eea781bc 'E'
|/ |/
| o 3: 'D' | o 3: 32af7686d403 'D'
| | | |
| o 2: 'C' | o 2: 5fddd98957c8 'C'
| | | |
| o 1: 'B' | o 1: 42ccdea3bb16 'B'
|/ |/
o 0: 'A' o 0: cd010b8cd998 'A'
Test that rebase is not confused by $CWD disappearing during rebase (issue4121) Test that rebase is not confused by $CWD disappearing during rebase (issue4121)
$ cd .. $ cd ..
$ hg init cwd-vanish $ hg init cwd-vanish
$ cd cwd-vanish $ cd cwd-vanish
$ touch initial-file $ touch initial-file
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ touch f && hg add f && hg ci -m F $ touch f && hg add f && hg ci -m F
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ touch g && hg add g && hg ci -m G $ touch g && hg add g && hg ci -m G
created new head created new head
$ hg tglog $ hg tglog
@ 6: 'G' @ 6: 124bb27b6f28 'G'
| |
| o 5: 'F' | o 5: 412b391de760 'F'
| | | |
| | o 4: 'E' | | o 4: 82ae8dc7a9b7 'E'
| | | | | |
| o | 3: 'D' | o | 3: ab709c9f7171 'D'
| | | | | |
| | o 2: 'C' | | o 2: d84f5cfaaf14 'C'
| |/ | |/
| o 1: 'B' | o 1: 76035bbd54bd 'B'
|/ |/
o 0: 'A' o 0: 216878401574 'A'
$ hg rebase -s 1 -d 6 $ hg rebase -s 1 -d 6
rebasing 1:76035bbd54bd "B" rebasing 1:76035bbd54bd "B"
rebasing 2:d84f5cfaaf14 "C" rebasing 2:d84f5cfaaf14 "C"
rebasing 4:82ae8dc7a9b7 "E" rebasing 4:82ae8dc7a9b7 "E"
rebasing 3:ab709c9f7171 "D" rebasing 3:ab709c9f7171 "D"
rebasing 5:412b391de760 "F" rebasing 5:412b391de760 "F"
saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob) saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob)
$ hg tglog $ hg tglog
o 6: 'F' o 6: 31884cfb735e 'F'
| |
o 5: 'D' o 5: 6d89fa5b0909 'D'
| |
| o 4: 'E' | o 4: de64d97c697b 'E'
| | | |
| o 3: 'C' | o 3: b18e4d2d0aa1 'C'
|/ |/
o 2: 'B' o 2: 0983daf9ff6a 'B'
| |
@ 1: 'G' @ 1: 124bb27b6f28 'G'
| |
o 0: 'A' o 0: 216878401574 'A'
Test experimental revset Test experimental revset
======================== ========================
$ cd ../cwd-vanish $ cd ../cwd-vanish
Make the repo a bit more interesting Make the repo a bit more interesting