equal
deleted
inserted
replaced
21 > echo "$1" > "$1" |
21 > echo "$1" > "$1" |
22 > hg add "$1" |
22 > hg add "$1" |
23 > hg ci -m "add $1" |
23 > hg ci -m "add $1" |
24 > } |
24 > } |
25 |
25 |
|
26 $ glog() { |
|
27 > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
|
28 > } |
|
29 |
26 various init |
30 various init |
27 |
31 |
28 $ hg init local |
32 $ hg init local |
29 $ cd local |
33 $ cd local |
30 $ mkcommit a |
34 $ mkcommit a |
50 1 - 7c3bad9141dc add b (public) |
54 1 - 7c3bad9141dc add b (public) |
51 0 - 1f0dee641bb7 add a (public) |
55 0 - 1f0dee641bb7 add a (public) |
52 |
56 |
53 test simple kill |
57 test simple kill |
54 |
58 |
55 $ hg kill 5 |
59 $ hg id -n |
|
60 5 |
|
61 $ hg kill . |
56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
57 working directory now at fbb94e3a0ecf |
63 working directory now at fbb94e3a0ecf |
58 $ hg qlog |
64 $ hg qlog |
59 4 - fbb94e3a0ecf add e (draft) |
65 4 - fbb94e3a0ecf add e (draft) |
60 3 - 47d2a3944de8 add d (draft) |
66 3 - 47d2a3944de8 add d (draft) |
69 working directory now at 7c3bad9141dc |
75 working directory now at 7c3bad9141dc |
70 $ hg qlog |
76 $ hg qlog |
71 2 - 4538525df7e2 add c (draft) |
77 2 - 4538525df7e2 add c (draft) |
72 1 - 7c3bad9141dc add b (public) |
78 1 - 7c3bad9141dc add b (public) |
73 0 - 1f0dee641bb7 add a (public) |
79 0 - 1f0dee641bb7 add a (public) |
|
80 |
|
81 test kill with dirty changes |
|
82 |
|
83 $ hg up 2 |
|
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 $ echo 4 > g |
|
86 $ hg add g |
|
87 $ hg kill . |
|
88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
89 working directory now at 7c3bad9141dc |
|
90 $ hg st |
|
91 A g |
74 $ cd .. |
92 $ cd .. |
75 |
93 |
76 ########################## |
94 ########################## |
77 importing Parren test |
95 importing Parren test |
78 ########################## |
96 ########################## |
207 $ hg log |
225 $ hg log |
208 6 feature-A: a nifty feature - test |
226 6 feature-A: a nifty feature - test |
209 4 feature-B: another feature - test |
227 4 feature-B: another feature - test |
210 1 : a nifty feature - test |
228 1 : a nifty feature - test |
211 0 : base - test |
229 0 : base - test |
212 $ hg up -q 1 |
230 $ hg up -q 0 |
213 Working directory parent is obsolete |
231 $ glog --hidden |
|
232 o 6:23409eba69a0@default(draft) a nifty feature |
|
233 | |
|
234 | o 5:e416e48b2742@default(secret) french looks better |
|
235 | | |
|
236 | | o 4:f8111a076f09@default(draft) another feature |
|
237 | |/ |
|
238 | | o 3:524e478d4811@default(secret) fix spelling of Zwei |
|
239 | | | |
|
240 | | o 2:7b36850622b2@default(secret) another feature |
|
241 | |/ |
|
242 | o 1:568a468b60fc@default(draft) a nifty feature |
|
243 |/ |
|
244 @ 0:e55e0562ee93@default(draft) base |
|
245 |
|
246 $ hg debugsuccessors |
|
247 524e478d4811 f8111a076f09 |
|
248 568a468b60fc 23409eba69a0 |
|
249 7b36850622b2 f8111a076f09 |
|
250 e416e48b2742 23409eba69a0 |
214 $ hg stabilize |
251 $ hg stabilize |
215 move:[4] another feature |
252 move:[4] another feature |
216 atop:[6] a nifty feature |
253 atop:[6] a nifty feature |
217 merging main-file-1 |
254 merging main-file-1 |
218 $ hg log |
255 $ hg log |
232 created new head |
269 created new head |
233 $ hg log |
270 $ hg log |
234 8 feature-B: another feature that rox - test |
271 8 feature-B: another feature that rox - test |
235 6 feature-A: a nifty feature - test |
272 6 feature-A: a nifty feature - test |
236 0 : base - test |
273 0 : base - test |
|
274 |
|
275 phase change turning obsolete changeset public issue a latecomer warning |
|
276 |
|
277 $ hg phase --public 7 |
|
278 1 new latecomers changesets |
|
279 |
237 $ cd .. |
280 $ cd .. |
238 |
281 |
239 enable general delta |
282 enable general delta |
240 |
283 |
241 $ cat << EOF >> $HGRCPATH |
284 $ cat << EOF >> $HGRCPATH |