Mercurial > hg
comparison tests/test-rebase-mq-skip.t @ 12608:16b854cb80f1
tests: unify test-rebase*
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 01 Oct 2010 16:10:06 +0200 |
parents | tests/test-rebase-mq-skip@00f8e7837668 |
children | 6cc4b14fb76b |
comparison
equal
deleted
inserted
replaced
12607:1393a81b3bdc | 12608:16b854cb80f1 |
---|---|
1 This emulates the effects of an hg pull --rebase in which the remote repo | |
2 already has one local mq patch | |
3 | |
4 $ cat >> $HGRCPATH <<EOF | |
5 > [extensions] | |
6 > graphlog= | |
7 > rebase= | |
8 > mq= | |
9 > | |
10 > [alias] | |
11 > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" | |
12 > EOF | |
13 | |
14 | |
15 $ hg init a | |
16 $ cd a | |
17 $ hg qinit -c | |
18 | |
19 $ echo c1 > c1 | |
20 $ hg add c1 | |
21 $ hg ci -m C1 | |
22 | |
23 $ echo r1 > r1 | |
24 $ hg add r1 | |
25 $ hg ci -m R1 | |
26 | |
27 $ hg up -q 0 | |
28 | |
29 $ hg qnew p0.patch | |
30 $ echo p0 > p0 | |
31 $ hg add p0 | |
32 $ hg qref -m P0 | |
33 | |
34 $ hg qnew p1.patch | |
35 $ echo p1 > p1 | |
36 $ hg add p1 | |
37 $ hg qref -m P1 | |
38 | |
39 $ hg export qtip > p1.patch | |
40 | |
41 $ hg up -q -C 1 | |
42 | |
43 $ hg import p1.patch | |
44 applying p1.patch | |
45 | |
46 $ rm p1.patch | |
47 | |
48 $ hg up -q -C qtip | |
49 | |
50 $ hg rebase | |
51 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | |
52 | |
53 $ hg tglog | |
54 @ 3: 'P0' tags: p0.patch qbase qtip tip | |
55 | | |
56 o 2: 'P1' tags: qparent | |
57 | | |
58 o 1: 'R1' tags: | |
59 | | |
60 o 0: 'C1' tags: | |
61 | |
62 $ cd .. | |
63 | |
64 | |
65 $ hg init b | |
66 $ cd b | |
67 $ hg qinit -c | |
68 | |
69 $ for i in r0 r1 r2 r3 r4 r5 r6; | |
70 > do | |
71 > echo $i > $i | |
72 > hg ci -Am $i | |
73 > done | |
74 adding r0 | |
75 adding r1 | |
76 adding r2 | |
77 adding r3 | |
78 adding r4 | |
79 adding r5 | |
80 adding r6 | |
81 | |
82 $ hg qimport -r 1:tip | |
83 | |
84 $ hg up -q 0 | |
85 | |
86 $ for i in r1 r3 r7 r8; | |
87 > do | |
88 > echo $i > $i | |
89 > hg ci -Am branch2-$i | |
90 > done | |
91 adding r1 | |
92 created new head | |
93 adding r3 | |
94 adding r7 | |
95 adding r8 | |
96 | |
97 $ echo somethingelse > r4 | |
98 $ hg ci -Am branch2-r4 | |
99 adding r4 | |
100 | |
101 $ echo r6 > r6 | |
102 $ hg ci -Am branch2-r6 | |
103 adding r6 | |
104 | |
105 $ hg up -q qtip | |
106 | |
107 $ HGMERGE=internal:fail hg rebase | |
108 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
109 [255] | |
110 | |
111 $ HGMERGE=internal:local hg resolve --all | |
112 | |
113 $ hg rebase --continue | |
114 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | |
115 | |
116 $ hg tglog | |
117 @ 9: 'r5' tags: 5.diff qtip tip | |
118 | | |
119 o 8: 'r4' tags: 4.diff | |
120 | | |
121 o 7: 'r2' tags: 2.diff qbase | |
122 | | |
123 o 6: 'branch2-r6' tags: qparent | |
124 | | |
125 o 5: 'branch2-r4' tags: | |
126 | | |
127 o 4: 'branch2-r8' tags: | |
128 | | |
129 o 3: 'branch2-r7' tags: | |
130 | | |
131 o 2: 'branch2-r3' tags: | |
132 | | |
133 o 1: 'branch2-r1' tags: | |
134 | | |
135 o 0: 'r0' tags: | |
136 |