equal
deleted
inserted
replaced
5 > |
5 > |
6 > [mq] |
6 > [mq] |
7 > plain=true |
7 > plain=true |
8 > |
8 > |
9 > [alias] |
9 > [alias] |
10 > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" |
10 > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" |
11 > EOF |
11 > EOF |
12 |
12 |
13 |
13 |
14 $ hg init a |
14 $ hg init a |
15 $ cd a |
15 $ cd a |
31 $ hg qnew f2.patch |
31 $ hg qnew f2.patch |
32 $ echo mq2 > f |
32 $ echo mq2 > f |
33 $ hg qref -m P1 -d '2 0' |
33 $ hg qref -m P1 -d '2 0' |
34 |
34 |
35 $ hg tglog |
35 $ hg tglog |
36 @ 3: 'P1' tags: f2.patch qtip tip |
36 @ 3: 929394423cd3 'P1' tags: f2.patch qtip tip |
37 | |
37 | |
38 o 2: 'P0' tags: f.patch qbase |
38 o 2: 3504f44bffc0 'P0' tags: f.patch qbase |
39 | |
39 | |
40 | o 1: 'R1' tags: |
40 | o 1: bac9ed9960d8 'R1' tags: |
41 |/ |
41 |/ |
42 o 0: 'C1' tags: qparent |
42 o 0: 36f36ddbca61 'C1' tags: qparent |
43 |
43 |
44 |
44 |
45 Rebase - try to rebase on an applied mq patch: |
45 Rebase - try to rebase on an applied mq patch: |
46 |
46 |
47 $ hg rebase -s 1 -d 3 |
47 $ hg rebase -s 1 -d 3 |
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) |
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) |
92 |
92 |
93 $ hg tglog |
93 $ hg tglog |
94 @ 3: 'P1' tags: f2.patch qtip tip |
94 @ 3: 462012cf340c 'P1' tags: f2.patch qtip tip |
95 | |
95 | |
96 o 2: 'P0' tags: f.patch qbase |
96 o 2: ebe9914c0d1c 'P0' tags: f.patch qbase |
97 | |
97 | |
98 o 1: 'R1' tags: qparent |
98 o 1: bac9ed9960d8 'R1' tags: qparent |
99 | |
99 | |
100 o 0: 'C1' tags: |
100 o 0: 36f36ddbca61 'C1' tags: |
101 |
101 |
102 $ hg up -q qbase |
102 $ hg up -q qbase |
103 |
103 |
104 $ cat f |
104 $ cat f |
105 mq1r1 |
105 mq1r1 |
296 empty-important: unguarded |
296 empty-important: unguarded |
297 bar: +baz |
297 bar: +baz |
298 foo: +baz |
298 foo: +baz |
299 |
299 |
300 $ hg tglog |
300 $ hg tglog |
301 @ 2: 'imported patch bar' tags: bar qtip tip |
301 @ 2: 4f44b861d38c 'imported patch bar' tags: bar qtip tip |
302 | |
302 | |
303 o 1: 'important commit message' tags: empty-important qbase |
303 o 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase |
304 | |
304 | |
305 o 0: 'a' tags: qparent |
305 o 0: cb9a9f314b8b 'a' tags: qparent |
306 |
306 |
307 Create new head to rebase bar onto: |
307 Create new head to rebase bar onto: |
308 |
308 |
309 $ hg up -C 0 |
309 $ hg up -C 0 |
310 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
310 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
317 $ echo a >> a |
317 $ echo a >> a |
318 $ hg qref |
318 $ hg qref |
319 |
319 |
320 $ hg tglog |
320 $ hg tglog |
321 @ 3: '[mq]: bar' tags: bar qtip tip |
321 @ 3: d526d4536ed6 '[mq]: bar' tags: bar qtip tip |
322 | |
322 | |
323 | o 2: 'b' tags: |
323 | o 2: d2ae7f538514 'b' tags: |
324 | | |
324 | | |
325 o | 1: 'important commit message' tags: empty-important qbase |
325 o | 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase |
326 |/ |
326 |/ |
327 o 0: 'a' tags: qparent |
327 o 0: cb9a9f314b8b 'a' tags: qparent |
328 |
328 |
329 |
329 |
330 Rebase bar (make sure series order is preserved and empty-important also is |
330 Rebase bar (make sure series order is preserved and empty-important also is |
331 removed from the series): |
331 removed from the series): |
332 |
332 |
349 guarded: +guarded |
349 guarded: +guarded |
350 bar: +baz |
350 bar: +baz |
351 foo: +baz |
351 foo: +baz |
352 |
352 |
353 $ hg tglog |
353 $ hg tglog |
354 @ 2: '[mq]: bar' tags: bar qbase qtip tip |
354 @ 2: 477d948bb2af '[mq]: bar' tags: bar qbase qtip tip |
355 | |
355 | |
356 o 1: 'b' tags: qparent |
356 o 1: d2ae7f538514 'b' tags: qparent |
357 | |
357 | |
358 o 0: 'a' tags: |
358 o 0: cb9a9f314b8b 'a' tags: |
359 |
359 |
360 $ cd .. |
360 $ cd .. |