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 (pre abort) |
|
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 file e already exists |
|
45 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
46 abort: Fix up the change and run hg histedit --continue |
|
47 % abort the edit |
|
48 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 % log after abort |
|
50 @ changeset: 6:bfa474341cc9 |
|
51 | tag: tip |
|
52 | user: test |
|
53 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
54 | summary: does not commute with e |
|
55 | |
|
56 o changeset: 5:652413bf663e |
|
57 | user: test |
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
59 | summary: f |
|
60 | |
|
61 o changeset: 4:e860deea161a |
|
62 | user: test |
|
63 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | summary: e |
|
65 | |
|
66 o changeset: 3:055a42cdd887 |
|
67 | user: test |
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | summary: d |
|
70 | |
|
71 o changeset: 2:177f92b77385 |
|
72 | user: test |
|
73 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 | summary: c |
|
75 | |
|
76 o changeset: 1:d2ae7f538514 |
|
77 | user: test |
|
78 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
79 | summary: b |
|
80 | |
|
81 o changeset: 0:cb9a9f314b8b |
|
82 user: test |
|
83 date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 summary: a |
|
85 |
|
86 % EOF |
|