1 $ cat >> $HGRCPATH <<EOF |
|
2 > [defaults] |
|
3 > amend=-d "0 0" |
|
4 > [web] |
|
5 > push_ssl = false |
|
6 > allow_push = * |
|
7 > [phases] |
|
8 > publish = False |
|
9 > [alias] |
|
10 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
|
11 > mqlog = log --mq --template='{rev} - {desc}\n' |
|
12 > [diff] |
|
13 > git = 1 |
|
14 > unified = 0 |
|
15 > [extensions] |
|
16 > hgext.rebase= |
|
17 > hgext.graphlog= |
|
18 > hgext.mq= |
|
19 > EOF |
|
20 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
21 $ echo "qsync=$(echo $(dirname $TESTDIR))/hgext/qsync.py" >> $HGRCPATH |
|
22 $ mkcommit() { |
|
23 > echo "$1" > "$1" |
|
24 > hg add "$1" |
|
25 > hg ci -m "add $1" |
|
26 > } |
|
27 |
|
28 basic sync |
|
29 |
|
30 $ hg init local |
|
31 $ cd local |
|
32 $ hg qinit -c |
|
33 $ hg qci -m "initial commit" |
|
34 $ mkcommit a |
|
35 $ mkcommit b |
|
36 $ hg qlog |
|
37 1 - 7c3bad9141dc add b (draft) |
|
38 0 - 1f0dee641bb7 add a (draft) |
|
39 $ hg qsync -a |
|
40 $ hg mqlog |
|
41 2 - qsubmit commit |
|
42 |
|
43 * DEFAULT-add_a.diff ready for review |
|
44 * DEFAULT-add_b.diff ready for review |
|
45 1 - qsubmit init |
|
46 0 - initial commit |
|
47 |
|
48 basic sync II |
|
49 |
|
50 $ hg init local |
|
51 $ cd local |
|
52 $ hg qinit -c |
|
53 $ hg qci -m "initial commit" |
|
54 $ mkcommit a |
|
55 $ mkcommit b |
|
56 $ hg qlog |
|
57 1 - 7c3bad9141dc add b (draft) |
|
58 0 - 1f0dee641bb7 add a (draft) |
|
59 $ hg qsync -a |
|
60 $ hg mqlog |
|
61 2 - qsubmit commit |
|
62 |
|
63 * DEFAULT-add_a.diff ready for review |
|
64 * DEFAULT-add_b.diff ready for review |
|
65 1 - qsubmit init |
|
66 0 - initial commit |
|
67 |
|
68 $ echo "b" >> b |
|
69 $ hg amend |
|
70 $ hg qsync -a |
|
71 $ hg mqlog |
|
72 3 - qsubmit commit |
|
73 |
|
74 * DEFAULT-add_b.diff ready for review |
|
75 2 - qsubmit commit |
|
76 |
|
77 * DEFAULT-add_a.diff ready for review |
|
78 * DEFAULT-add_b.diff ready for review |
|
79 1 - qsubmit init |
|
80 0 - initial commit |
|
81 |
|
82 $ hg up -r 0 |
|
83 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
84 $ echo "a" >> a |
|
85 $ hg amend |
|
86 1 new unstable changesets |
|
87 $ hg graft -O 3 |
|
88 grafting revision 3 |
|
89 $ hg qsync -a |
|
90 $ hg mqlog |
|
91 4 - qsubmit commit |
|
92 |
|
93 * DEFAULT-add_a.diff ready for review |
|
94 * DEFAULT-add_b.diff ready for review |
|
95 3 - qsubmit commit |
|
96 |
|
97 * DEFAULT-add_b.diff ready for review |
|
98 2 - qsubmit commit |
|
99 |
|
100 * DEFAULT-add_a.diff ready for review |
|
101 * DEFAULT-add_b.diff ready for review |
|
102 1 - qsubmit init |
|
103 0 - initial commit |
|
104 |
|
105 sync with published changeset |
|
106 |
|
107 $ hg init local |
|
108 $ cd local |
|
109 $ hg qinit -c |
|
110 $ hg qci -m "initial commit" |
|
111 $ mkcommit a |
|
112 $ mkcommit b |
|
113 $ hg qlog |
|
114 1 - 7c3bad9141dc add b (draft) |
|
115 0 - 1f0dee641bb7 add a (draft) |
|
116 $ hg qsync -a |
|
117 $ hg mqlog |
|
118 2 - qsubmit commit |
|
119 |
|
120 * DEFAULT-add_a.diff ready for review |
|
121 * DEFAULT-add_b.diff ready for review |
|
122 1 - qsubmit init |
|
123 0 - initial commit |
|
124 |
|
125 $ hg phase -p 0 |
|
126 $ hg qsync -a |
|
127 $ hg mqlog |
|
128 3 - qsubmit commit |
|
129 |
|
130 * applied DEFAULT-add_a.diff |
|
131 2 - qsubmit commit |
|
132 |
|
133 * DEFAULT-add_a.diff ready for review |
|
134 * DEFAULT-add_b.diff ready for review |
|
135 1 - qsubmit init |
|
136 0 - initial commit |
|
137 |
|
138 $ mkcommit c |
|
139 $ mkcommit d |
|
140 $ hg qsync -a |
|
141 $ hg mqlog |
|
142 4 - qsubmit commit |
|
143 |
|
144 * DEFAULT-add_c.diff ready for review |
|
145 * DEFAULT-add_d.diff ready for review |
|
146 3 - qsubmit commit |
|
147 |
|
148 * applied DEFAULT-add_a.diff |
|
149 2 - qsubmit commit |
|
150 |
|
151 * DEFAULT-add_a.diff ready for review |
|
152 * DEFAULT-add_b.diff ready for review |
|
153 1 - qsubmit init |
|
154 0 - initial commit |
|
155 |
|
156 $ cd .. |
|
157 $ hg qclone -U local local2 |
|
158 $ cd local2 |
|
159 $ hg qlog |
|
160 3 - 47d2a3944de8 add d (draft) |
|
161 2 - 4538525df7e2 add c (draft) |
|
162 1 - 7c3bad9141dc add b (draft) |
|
163 0 - 1f0dee641bb7 add a (public) |
|
164 $ hg strip -n 1 --no-backup |
|
165 $ hg up |
|
166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 $ hg up --mq 4 |
|
168 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 $ hg qseries |
|
170 DEFAULT-add_b.diff |
|
171 DEFAULT-add_c.diff |
|
172 DEFAULT-add_d.diff |
|
173 $ hg qpush |
|
174 applying DEFAULT-add_b.diff |
|
175 now at: DEFAULT-add_b.diff |
|
176 $ hg qfinish -a |
|
177 $ hg phase -p . |
|
178 $ hg qci -m "applied DEFAULT-add_b.diff" |
|
179 $ cd ../local |
|
180 $ hg pull ../local2 |
|
181 pulling from ../local2 |
|
182 searching for changes |
|
183 no changes found |
|
184 $ hg pull --mq ../local2/.hg/patches |
|
185 pulling from ../local2/.hg/patches |
|
186 searching for changes |
|
187 adding changesets |
|
188 adding manifests |
|
189 adding file changes |
|
190 added 1 changesets with 1 changes to 1 files |
|
191 (run 'hg update' to get a working copy) |
|
192 $ hg qlog |
|
193 3 - 47d2a3944de8 add d (draft) |
|
194 2 - 4538525df7e2 add c (draft) |
|
195 1 - 7c3bad9141dc add b (public) |
|
196 0 - 1f0dee641bb7 add a (public) |
|
197 $ hg mqlog -l 1 |
|
198 5 - applied DEFAULT-add_b.diff |
|
199 $ hg status --mq --rev tip:-2 |
|
200 M series |
|
201 A DEFAULT-add_b.diff |
|
202 $ hg qsync -a |
|
203 $ hg status --mq --rev tip:-2 |
|
204 M qsubmitdata |
|
205 $ hg mqlog -l 1 |
|
206 6 - qsubmit commit |
|
207 |
|
208 * applied DEFAULT-add_b.diff |
|
209 $ hg qsync -a |
|
210 abort: Nothing changed |
|
211 [255] |
|
212 |
|
213 mixed sync |
|
214 |
|
215 $ hg init local |
|
216 $ cd local |
|
217 $ hg qinit -c |
|
218 $ mkcommit a |
|
219 $ mkcommit b |
|
220 $ hg qlog |
|
221 1 - 7c3bad9141dc add b (draft) |
|
222 0 - 1f0dee641bb7 add a (draft) |
|
223 $ hg qsync -a |
|
224 $ hg mqlog |
|
225 1 - qsubmit commit |
|
226 |
|
227 * DEFAULT-add_a.diff ready for review |
|
228 * DEFAULT-add_b.diff ready for review |
|
229 0 - qsubmit init |
|
230 $ hg phase -p 0 |
|
231 $ echo "b" >> b |
|
232 $ hg amend |
|
233 $ hg qsync -a |
|
234 $ hg mqlog -l 1 |
|
235 2 - qsubmit commit |
|
236 |
|
237 * applied DEFAULT-add_a.diff |
|
238 * DEFAULT-add_b.diff ready for review |
|
239 |
|