Mercurial > hg
annotate tests/test-rebase-mq.t @ 26749:4a82cb5c1dc8
dirstate: show develwarn for write() invocation without transaction
This is used to detect 'dirstate.write()' invocation without the value
gotten by 'repo.currenttransaction()' (mainly focused on 3rd party
extensions).
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Oct 2015 01:15:34 +0900 |
parents | ef1eb6df7071 |
children | 157675d0f600 |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
3 > rebase= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
4 > mq= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
5 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
6 > [mq] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
7 > plain=true |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
8 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
9 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
10 > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
11 > EOF |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
10672
diff
changeset
|
12 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
13 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
14 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
15 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
16 $ hg qinit -c |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
17 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
18 $ echo c1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
19 $ hg add f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
20 $ hg ci -m C1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
21 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
22 $ echo r1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
23 $ hg ci -m R1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
24 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
25 $ hg up -q 0 |
10397
8cb81d75730c
mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents:
8168
diff
changeset
|
26 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
27 $ hg qnew f.patch -d '1 0' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
28 $ echo mq1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
29 $ hg qref -m P0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
30 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
31 $ hg qnew f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
32 $ echo mq2 > f |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
33 $ hg qref -m P1 -d '2 0' |
6931
02f4a0bcfdce
test-rebase-mq: '|' is a GNU sed extension, unfold it
Patrick Mezard <pmezard@gmail.com>
parents:
6906
diff
changeset
|
34 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
35 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
36 @ 3: 'P1' tags: f2.patch qtip tip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
37 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
38 o 2: 'P0' tags: f.patch qbase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
39 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
40 | o 1: 'R1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
41 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
42 o 0: 'C1' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
43 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
44 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
45 Rebase - try to rebase on an applied mq patch: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
46 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
47 $ hg rebase -s 1 -d 3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
48 abort: cannot rebase onto an applied mq patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
49 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
50 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
51 Rebase - same thing, but mq patch is default dest: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
52 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
53 $ hg up -q 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
54 $ hg rebase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
55 abort: cannot rebase onto an applied mq patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
56 [255] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
57 $ hg up -q qtip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
58 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
59 Rebase - generate a conflict: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
60 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
61 $ hg rebase -s 2 -d 1 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
62 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
63 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23835
diff
changeset
|
64 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18648
diff
changeset
|
65 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
|
66 [1] |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
67 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
68 Fix the 1st conflict: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
69 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
70 $ echo mq1r1 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
71 $ hg resolve -m f |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
72 (no more unresolved files) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
73 $ hg rebase -c |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
74 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
75 rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
76 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23835
diff
changeset
|
77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18648
diff
changeset
|
78 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
|
79 [1] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
80 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
81 Fix the 2nd conflict: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
82 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
83 $ echo mq1r1mq2 > f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
84 $ hg resolve -m f |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
85 (no more unresolved files) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
86 $ hg rebase -c |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
87 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
88 rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23518
diff
changeset
|
89 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-backup.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
90 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
91 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
92 @ 3: 'P1' tags: f2.patch qtip tip |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
93 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
94 o 2: 'P0' tags: f.patch qbase |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
95 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
96 o 1: 'R1' tags: qparent |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
97 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
98 o 0: 'C1' tags: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
99 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
100 $ hg up -q qbase |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
101 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
102 $ cat f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
103 mq1r1 |
10672
c2e1e637d4da
rebase: always check if rebasing onto an applied mq patch.
Greg Ward <greg-hg@gerg.ca>
parents:
10397
diff
changeset
|
104 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
105 $ cat .hg/patches/f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
106 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
107 # User test |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
108 # Date 1 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
109 # Thu Jan 01 00:00:01 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
110 # Node ID ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
111 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
112 P0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
113 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
114 diff -r bac9ed9960d8 -r ebe9914c0d1c f |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
115 --- a/f Thu Jan 01 00:00:00 1970 +0000 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
116 +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
117 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
118 -r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
119 +mq1r1 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
120 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
121 Update to qtip: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
122 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
123 $ hg up -q qtip |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
124 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
125 $ cat f |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
126 mq1r1mq2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
127 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
128 $ cat .hg/patches/f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
129 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
130 # User test |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
131 # Date 2 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
132 # Thu Jan 01 00:00:02 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
133 # Node ID 462012cf340c97d44d62377c985a423f6bb82f07 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
134 # Parent ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
135 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
136 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
137 diff -r ebe9914c0d1c -r 462012cf340c f |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
138 --- a/f Thu Jan 01 00:00:01 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
139 +++ b/f Thu Jan 01 00:00:02 1970 +0000 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
140 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
141 -mq1r1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
142 +mq1r1mq2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
143 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
144 Adding one git-style patch and one normal: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
145 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
146 $ hg qpop -a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
147 popping f2.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
148 popping f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
149 patch queue now empty |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
150 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
151 $ rm -fr .hg/patches |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
152 $ hg qinit -c |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
153 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
154 $ hg up -q 0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
155 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
156 $ hg qnew --git f_git.patch -d '3 0' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
157 $ echo mq1 > p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
158 $ hg add p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
159 $ hg qref --git -m 'P0 (git)' |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
160 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
161 $ hg qnew f.patch -d '4 0' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
162 $ echo mq2 > p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
163 $ hg qref -m P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
164 $ hg qci -m 'save patch state' |
6931
02f4a0bcfdce
test-rebase-mq: '|' is a GNU sed extension, unfold it
Patrick Mezard <pmezard@gmail.com>
parents:
6906
diff
changeset
|
165 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
166 $ hg qseries -s |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
167 f_git.patch: P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
168 f.patch: P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
169 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
170 $ hg -R .hg/patches manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
171 .hgignore |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
172 f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
173 f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
174 series |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
175 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
176 $ cat .hg/patches/f_git.patch |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
177 Date: 3 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
178 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
179 P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
180 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
181 diff --git a/p b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
182 new file mode 100644 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
183 --- /dev/null |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
184 +++ b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
185 @@ -0,0 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
186 +mq1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
187 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
188 $ cat .hg/patches/f.patch |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
189 Date: 4 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
190 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
191 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
192 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
193 diff -r ???????????? p (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
194 --- a/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
195 +++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
196 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
197 -mq1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
198 +mq2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
199 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
200 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
201 Rebase the applied mq patches: |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
202 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
203 $ hg rebase -s 2 -d 1 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
204 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23515
diff
changeset
|
205 rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23518
diff
changeset
|
206 saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-backup.hg (glob) |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
207 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
208 $ hg qci -m 'save patch state' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
209 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
210 $ hg qseries -s |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
211 f_git.patch: P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
212 f.patch: P1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
213 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
214 $ hg -R .hg/patches manifest |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
215 .hgignore |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
216 f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
217 f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
218 series |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
219 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
220 $ cat .hg/patches/f_git.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
221 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
222 # User test |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
223 # Date 3 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
224 # Thu Jan 01 00:00:03 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
225 # Node ID 12d9f6a3bbe560dee50c7c454d434add7fb8e837 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
226 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
227 P0 (git) |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
228 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
229 diff --git a/p b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
230 new file mode 100644 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
231 --- /dev/null |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
232 +++ b/p |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
233 @@ -0,0 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
234 +mq1 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
235 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
236 $ cat .hg/patches/f.patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
237 # HG changeset patch |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
238 # User test |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
239 # Date 4 0 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
240 # Thu Jan 01 00:00:04 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
241 # Node ID c77a2661c64c60d82f63c4f7aefd95b3a948a557 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
242 # Parent 12d9f6a3bbe560dee50c7c454d434add7fb8e837 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
243 P1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
244 |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
245 diff -r 12d9f6a3bbe5 -r c77a2661c64c p |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
246 --- a/p Thu Jan 01 00:00:03 1970 +0000 |
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
247 +++ b/p Thu Jan 01 00:00:04 1970 +0000 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
248 @@ -1,1 +1,1 @@ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
249 -mq1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11536
diff
changeset
|
250 +mq2 |
7955
c3d4ff03ec72
rebase: keep original mq patch format (Issue1574)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6931
diff
changeset
|
251 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16531
diff
changeset
|
252 $ cd .. |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
253 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
254 Rebase with guards |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
255 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
256 $ hg init foo |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
257 $ cd foo |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
258 $ echo a > a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
259 $ hg ci -Am a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
260 adding a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
261 |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
262 Create mq repo with guarded patches foo and bar and empty patch: |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
263 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
264 $ hg qinit |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
265 $ echo guarded > guarded |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
266 $ hg add guarded |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
267 $ hg qnew guarded |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
268 $ hg qnew empty-important -m 'important commit message' -d '1 0' |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
269 $ echo bar > bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
270 $ hg add bar |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
271 $ hg qnew bar -d '2 0' |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
272 $ echo foo > foo |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
273 $ hg add foo |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
274 $ hg qnew foo |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
275 $ hg qpop -a |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
276 popping foo |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
277 popping bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
278 popping empty-important |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
279 popping guarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
280 patch queue now empty |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
281 $ hg qguard guarded +guarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
282 $ hg qguard bar +baz |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
283 $ hg qguard foo +baz |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
284 $ hg qselect baz |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
285 number of unguarded, unapplied patches has changed from 1 to 3 |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
286 $ hg qpush bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
287 applying empty-important |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
288 patch empty-important is empty |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
289 applying bar |
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
290 now at: bar |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
291 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
292 $ hg qguard -l |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
293 guarded: +guarded |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
294 empty-important: unguarded |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
295 bar: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
296 foo: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
297 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
298 $ hg tglog |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
299 @ 2: 'imported patch bar' tags: bar qtip tip |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
300 | |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
301 o 1: 'important commit message' tags: empty-important qbase |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
302 | |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
303 o 0: 'a' tags: qparent |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
304 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
305 Create new head to rebase bar onto: |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
306 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
307 $ hg up -C 0 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
308 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
309 $ echo b > b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
310 $ hg add b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
311 $ hg ci -m b |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
312 created new head |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
313 $ hg up -C 2 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
314 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
315 $ echo a >> a |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
316 $ hg qref |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
317 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
318 $ hg tglog |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
319 @ 3: '[mq]: bar' tags: bar qtip tip |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
320 | |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
321 | o 2: 'b' tags: |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
322 | | |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
323 o | 1: 'important commit message' tags: empty-important qbase |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
324 |/ |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
325 o 0: 'a' tags: qparent |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
326 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
327 |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
328 Rebase bar (make sure series order is preserved and empty-important also is |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
329 removed from the series): |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
330 |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
331 $ hg qseries |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
332 guarded |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
333 empty-important |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
334 bar |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
335 foo |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
336 $ [ -f .hg/patches/empty-important ] |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
337 $ hg -q rebase -d 2 |
23518
2fb0504b8175
rebase: show warning when rebase creates no changes to commit
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
338 note: rebase of 1:0aaf4c3af7eb created no changes to commit |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
339 $ hg qseries |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
340 guarded |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
341 bar |
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
342 foo |
15904
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
343 $ [ -f .hg/patches/empty-important ] |
7d28d6a67dd3
rebase: write series file without removed mq patches
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
344 [1] |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
345 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
346 $ hg qguard -l |
16531
b9f51f49bf2a
rebase: preserve mq series order, guarded patches (issue2849)
Patrick Mezard <patrick@mezard.eu>
parents:
15904
diff
changeset
|
347 guarded: +guarded |
14599
b28004513977
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com>
parents:
13766
diff
changeset
|
348 bar: +baz |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
349 foo: +baz |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
350 |
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
351 $ hg tglog |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
352 @ 2: '[mq]: bar' tags: bar qbase qtip tip |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
353 | |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
354 o 1: 'b' tags: qparent |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
355 | |
23515
7856a87bbb02
tests: stabilise mq rebase tests
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
356 o 0: 'a' tags: |
13766
627e50e9e316
rebase: restore mq guards after rebasing (issue2107)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
12896
diff
changeset
|
357 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16531
diff
changeset
|
358 $ cd .. |