|
1 $ . "$TESTDIR/histedit-helpers.sh" |
|
2 |
|
3 $ cat >> $HGRCPATH <<EOF |
|
4 > [extensions] |
|
5 > graphlog= |
|
6 > histedit= |
|
7 > EOF |
|
8 |
|
9 $ EDITED=`pwd`/editedhistory |
|
10 $ cat > $EDITED <<EOF |
|
11 > pick 177f92b77385 c |
|
12 > pick 055a42cdd887 d |
|
13 > pick bfa474341cc9 does not commute with e |
|
14 > pick e860deea161a e |
|
15 > pick 652413bf663e f |
|
16 > EOF |
|
17 $ initrepo () |
|
18 > { |
|
19 > hg init r |
|
20 > cd r |
|
21 > for x in a b c d e f ; do |
|
22 > echo $x > $x |
|
23 > hg add $x |
|
24 > hg ci -m $x |
|
25 > done |
|
26 > echo a >> e |
|
27 > hg ci -m 'does not commute with e' |
|
28 > cd .. |
|
29 > } |
|
30 |
|
31 $ initrepo |
|
32 $ cd r |
|
33 |
|
34 log before edit |
|
35 $ hg log --graph |
|
36 @ changeset: 6:bfa474341cc9 |
|
37 | tag: tip |
|
38 | user: test |
|
39 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
40 | summary: does not commute with e |
|
41 | |
|
42 o changeset: 5:652413bf663e |
|
43 | user: test |
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
45 | summary: f |
|
46 | |
|
47 o changeset: 4:e860deea161a |
|
48 | user: test |
|
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
50 | summary: e |
|
51 | |
|
52 o changeset: 3:055a42cdd887 |
|
53 | user: test |
|
54 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 | summary: d |
|
56 | |
|
57 o changeset: 2:177f92b77385 |
|
58 | user: test |
|
59 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | summary: c |
|
61 | |
|
62 o changeset: 1:d2ae7f538514 |
|
63 | user: test |
|
64 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 | summary: b |
|
66 | |
|
67 o changeset: 0:cb9a9f314b8b |
|
68 user: test |
|
69 date: Thu Jan 01 00:00:00 1970 +0000 |
|
70 summary: a |
|
71 |
|
72 |
|
73 edit the history |
|
74 $ HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
76 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
77 abort: Fix up the change and run hg histedit --continue |
|
78 |
|
79 fix up (pre abort) |
|
80 $ echo a > e |
|
81 $ hg add e |
|
82 $ hg histedit --continue 2>&1 | fixbundle |
|
83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 file e already exists |
|
85 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
86 abort: Fix up the change and run hg histedit --continue |
|
87 |
|
88 abort the edit |
|
89 $ hg histedit --abort 2>&1 | fixbundle |
|
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 |
|
92 log after abort |
|
93 $ hg log --graph |
|
94 @ changeset: 6:bfa474341cc9 |
|
95 | tag: tip |
|
96 | user: test |
|
97 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
98 | summary: does not commute with e |
|
99 | |
|
100 o changeset: 5:652413bf663e |
|
101 | user: test |
|
102 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
103 | summary: f |
|
104 | |
|
105 o changeset: 4:e860deea161a |
|
106 | user: test |
|
107 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
108 | summary: e |
|
109 | |
|
110 o changeset: 3:055a42cdd887 |
|
111 | user: test |
|
112 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
113 | summary: d |
|
114 | |
|
115 o changeset: 2:177f92b77385 |
|
116 | user: test |
|
117 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | summary: c |
|
119 | |
|
120 o changeset: 1:d2ae7f538514 |
|
121 | user: test |
|
122 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
123 | summary: b |
|
124 | |
|
125 o changeset: 0:cb9a9f314b8b |
|
126 user: test |
|
127 date: Thu Jan 01 00:00:00 1970 +0000 |
|
128 summary: a |
|
129 |
|
130 |
|
131 $ cd .. |