1 % log before edit |
|
2 @ changeset: 6:bfa474341cc9 |
|
3 | tag: tip |
|
4 | user: test |
|
5 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
6 | summary: does not commute with e |
|
7 | |
|
8 o changeset: 5:652413bf663e |
|
9 | user: test |
|
10 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
11 | summary: f |
|
12 | |
|
13 o changeset: 4:e860deea161a |
|
14 | user: test |
|
15 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
16 | summary: e |
|
17 | |
|
18 o changeset: 3:055a42cdd887 |
|
19 | user: test |
|
20 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
21 | summary: d |
|
22 | |
|
23 o changeset: 2:177f92b77385 |
|
24 | user: test |
|
25 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
26 | summary: c |
|
27 | |
|
28 o changeset: 1:d2ae7f538514 |
|
29 | user: test |
|
30 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
31 | summary: b |
|
32 | |
|
33 o changeset: 0:cb9a9f314b8b |
|
34 user: test |
|
35 date: Thu Jan 01 00:00:00 1970 +0000 |
|
36 summary: a |
|
37 |
|
38 % edit the history |
|
39 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
40 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
41 abort: Fix up the change and run hg histedit --continue |
|
42 % fix up |
|
43 d |
|
44 *** |
|
45 does not commute with e |
|
46 |
|
47 |
|
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 file e already exists |
|
50 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
51 abort: Fix up the change and run hg histedit --continue |
|
52 |
|
53 % just continue this time |
|
54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
55 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
56 % log after edit |
|
57 @ changeset: 4:f768fd60ca34 |
|
58 | tag: tip |
|
59 | user: test |
|
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
61 | summary: f |
|
62 | |
|
63 o changeset: 3:671efe372e33 |
|
64 | user: test |
|
65 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 | summary: d |
|
67 | |
|
68 o changeset: 2:177f92b77385 |
|
69 | user: test |
|
70 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
71 | summary: c |
|
72 | |
|
73 o changeset: 1:d2ae7f538514 |
|
74 | user: test |
|
75 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
76 | summary: b |
|
77 | |
|
78 o changeset: 0:cb9a9f314b8b |
|
79 user: test |
|
80 date: Thu Jan 01 00:00:00 1970 +0000 |
|
81 summary: a |
|
82 |
|
83 % contents of e |
|
84 a |
|
85 % manifest |
|
86 a |
|
87 b |
|
88 c |
|
89 d |
|
90 e |
|
91 f |
|
92 % EOF |
|