Mercurial > hg
annotate tests/test-rebase-mq-skip.t @ 31251:34d57ddaf9f2
vfs: use 'vfs' module directly in 'test-filecache'
Now that the 'vfs' classes moved in their own module, lets use the new module
directly. We update code iteratively to help with possible bisect needs in the
future.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 02 Mar 2017 13:33:28 +0100 |
parents | 6b0741d6d234 |
children | 3b7cb3d17137 |
rev | line source |
---|---|
12785
c7d23b4ca4ba
check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12640
diff
changeset
|
1 This emulates the effects of an hg pull --rebase in which the remote repo |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
2 already has one local mq patch |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
3 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
4 $ cat >> $HGRCPATH <<EOF |
26916
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
5 > [format] |
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
6 > usegeneraldelta=yes |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
7 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
8 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
9 > mq= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
10 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
12896
diff
changeset
|
11 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
12896
diff
changeset
|
12 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
12896
diff
changeset
|
13 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
14 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
15 > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
16 > EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
17 |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
8168
diff
changeset
|
18 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
19 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
20 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
21 $ hg qinit -c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
22 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
23 $ echo c1 > c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
24 $ hg add c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
25 $ hg ci -m C1 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
26 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
27 $ echo r1 > r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
28 $ hg add r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
29 $ hg ci -m R1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
30 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
31 $ hg up -q 0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
32 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
33 $ hg qnew p0.patch -d '1 0' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
34 $ echo p0 > p0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
35 $ hg add p0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
36 $ hg qref -m P0 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
37 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
38 $ hg qnew p1.patch -d '2 0' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
39 $ echo p1 > p1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
40 $ hg add p1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
41 $ hg qref -m P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
42 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
43 $ hg export qtip > p1.patch |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
44 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
45 $ hg up -q -C 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
46 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
47 $ hg import p1.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
48 applying p1.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
49 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
50 $ rm p1.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
51 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
52 $ hg up -q -C qtip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
53 |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
54 $ hg rebase -v |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
55 rebasing 2:13a46ce44f60 "P0" (p0.patch qbase) |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
56 resolving manifests |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
57 removing p0 |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
58 getting r1 |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
59 resolving manifests |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
60 getting p0 |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
61 committing files: |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
62 p0 |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
63 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23748
diff
changeset
|
64 committing changelog |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
65 rebasing 3:148775c71080 "P1" (p1.patch qtip) |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
66 resolving manifests |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
67 note: rebase of 3:148775c71080 created no changes to commit |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
68 rebase merging completed |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
69 updating mq patch p0.patch to 5:9ecc820b1737 |
23627
7aaf987d9e88
tests: add missing globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23520
diff
changeset
|
70 $TESTTMP/a/.hg/patches/p0.patch (glob) |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
71 2 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23627
diff
changeset
|
72 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
27626
diff
changeset
|
73 348 (changelog) |
26916
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
74 324 (manifests) |
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
75 129 p0 |
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
76 129 p1 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23749
diff
changeset
|
77 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob) |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
78 2 changesets found |
23748
4ab66de46a96
bundle: when verbose, show what takes up the space in the generated bundle
Mads Kiilerich <madski@unity3d.com>
parents:
23627
diff
changeset
|
79 uncompressed size of bundle content: |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
27626
diff
changeset
|
80 403 (changelog) |
26916
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
81 324 (manifests) |
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
82 129 p0 |
c7931d8ea29c
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26736
diff
changeset
|
83 129 p1 |
23520
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
84 adding branch |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
85 adding changesets |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
86 adding manifests |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
87 adding file changes |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
88 added 2 changesets with 2 changes to 2 files |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
89 rebase completed |
de143427c499
rebase: show a note for updated mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
23518
diff
changeset
|
90 1 revisions have been skipped |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
91 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
92 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
93 @ 3: 'P0' tags: p0.patch qbase qtip tip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
94 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
95 o 2: 'P1' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
96 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
97 o 1: 'R1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
98 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
99 o 0: 'C1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
100 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
101 $ cd .. |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
102 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
103 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
104 $ hg init b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
105 $ cd b |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
106 $ hg qinit -c |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
107 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
108 $ for i in r0 r1 r2 r3 r4 r5 r6; |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
109 > do |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
110 > echo $i > $i |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
111 > hg ci -Am $i |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
112 > done |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
113 adding r0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
114 adding r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
115 adding r2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
116 adding r3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
117 adding r4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
118 adding r5 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
119 adding r6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
120 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
121 $ hg qimport -r 1:tip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
122 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
123 $ hg up -q 0 |
11843
00f8e7837668
rebase: recompute the set of skipped rev when using --continue (issue2330)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
11208
diff
changeset
|
124 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
125 $ for i in r1 r3 r7 r8; |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
126 > do |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
127 > echo $i > $i |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
128 > hg ci -Am branch2-$i |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
129 > done |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
130 adding r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
131 created new head |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
132 adding r3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
133 adding r7 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
134 adding r8 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
135 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
136 $ echo somethingelse > r4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
137 $ hg ci -Am branch2-r4 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
138 adding r4 |
11843
00f8e7837668
rebase: recompute the set of skipped rev when using --continue (issue2330)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
11208
diff
changeset
|
139 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
140 $ echo r6 > r6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
141 $ hg ci -Am branch2-r6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
142 adding r6 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
143 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
144 $ hg up -q qtip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
145 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
146 $ HGMERGE=internal:fail hg rebase |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
147 rebasing 1:b4bffa6e4776 "r1" (qbase r1) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
148 note: rebase of 1:b4bffa6e4776 created no changes to commit |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
149 rebasing 2:c0fd129beb01 "r2" (r2) |
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
150 rebasing 3:6ff5b8feed8e "r3" (r3) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
151 note: rebase of 3:6ff5b8feed8e created no changes to commit |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
152 rebasing 4:094320fec554 "r4" (r4) |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
17345
diff
changeset
|
153 unresolved conflicts (see hg resolve, then hg rebase --continue) |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18933
diff
changeset
|
154 [1] |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
155 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
156 $ HGMERGE=internal:local hg resolve --all |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
157 (no more unresolved files) |
27626
157675d0f600
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
26916
diff
changeset
|
158 continue: hg rebase --continue |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
159 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
160 $ hg rebase --continue |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
161 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
162 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a |
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
163 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a |
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
164 rebasing 4:094320fec554 "r4" (r4) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
165 note: rebase of 4:094320fec554 created no changes to commit |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
166 rebasing 5:681a378595ba "r5" (r5) |
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
167 rebasing 6:512a1f24768b "r6" (qtip r6) |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
168 note: rebase of 6:512a1f24768b created no changes to commit |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23749
diff
changeset
|
169 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob) |
11843
00f8e7837668
rebase: recompute the set of skipped rev when using --continue (issue2330)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
11208
diff
changeset
|
170 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
171 $ hg tglog |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
172 @ 8: 'r5' tags: qtip r5 tip |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
173 | |
26736
143b52fce68e
mq: generate patch names from first line of description
Mads Kiilerich <mads@kiilerich.com>
parents:
23835
diff
changeset
|
174 o 7: 'r2' tags: qbase r2 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
175 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
176 o 6: 'branch2-r6' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
177 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
178 o 5: 'branch2-r4' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
179 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
180 o 4: 'branch2-r8' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
181 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
182 o 3: 'branch2-r7' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
183 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
184 o 2: 'branch2-r3' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
185 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
186 o 1: 'branch2-r1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
187 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
188 o 0: 'r0' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11843
diff
changeset
|
189 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16509
diff
changeset
|
190 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16509
diff
changeset
|
191 $ cd .. |