Show More
@@ -6,79 +6,95 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 | $ EDITED="$TESTTMP/editedhistory" |
|
|||
10 | $ cat > $EDITED <<EOF |
|
|||
11 | > pick 177f92b77385 c |
|
|||
12 | > pick 055a42cdd887 d |
|
|||
13 | > fold bfa474341cc9 does not commute with e |
|
|||
14 | > pick e860deea161a e |
|
|||
15 | > pick 652413bf663e f |
|
|||
16 | > EOF |
|
|||
17 | $ initrepo () |
|
9 | $ initrepo () | |
18 | > { |
|
10 | > { | |
19 | > hg init $1 |
|
11 | > hg init $1 | |
20 | > cd $1 |
|
12 | > cd $1 | |
21 | > for x in a b c d e f ; do |
|
13 | > for x in a b c d e f ; do | |
|
14 | > echo $x$x$x$x$x > $x | |||
|
15 | > hg add $x | |||
|
16 | > done | |||
|
17 | > hg ci -m 'Initial commit' | |||
|
18 | > for x in a b c d e f ; do | |||
22 | > echo $x > $x |
|
19 | > echo $x > $x | |
23 | > hg add $x |
|
|||
24 | > hg ci -m $x |
|
20 | > hg ci -m $x | |
25 | > done |
|
21 | > done | |
26 |
> echo a > |
|
22 | > echo 'I can haz no commute' > e | |
27 | > hg ci -m 'does not commute with e' |
|
23 | > hg ci -m 'does not commute with e' | |
28 | > cd .. |
|
24 | > cd .. | |
29 | > } |
|
25 | > } | |
30 |
|
26 | |||
31 | $ initrepo r |
|
27 | $ initrepo r | |
32 | $ cd r |
|
28 | $ cd r | |
|
29 | Initial generation of the command files | |||
|
30 | ||||
|
31 | $ EDITED="$TESTTMP/editedhistory" | |||
|
32 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 3 >> $EDITED | |||
|
33 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 4 >> $EDITED | |||
|
34 | $ hg log --template 'fold {node|short} {rev} {desc}\n' -r 7 >> $EDITED | |||
|
35 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 5 >> $EDITED | |||
|
36 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 6 >> $EDITED | |||
|
37 | $ cat $EDITED | |||
|
38 | pick 65a9a84f33fd 3 c | |||
|
39 | pick 00f1c5383965 4 d | |||
|
40 | fold 39522b764e3d 7 does not commute with e | |||
|
41 | pick 7b4e2f4b7bcd 5 e | |||
|
42 | pick 500cac37a696 6 f | |||
33 |
|
43 | |||
34 | log before edit |
|
44 | log before edit | |
35 | $ hg log --graph |
|
45 | $ hg log --graph | |
36 |
@ changeset: |
|
46 | @ changeset: 7:39522b764e3d | |
37 | | tag: tip |
|
47 | | tag: tip | |
38 | | user: test |
|
48 | | user: test | |
39 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
49 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
40 | | summary: does not commute with e |
|
50 | | summary: does not commute with e | |
41 | | |
|
51 | | | |
42 |
o changeset: 5 |
|
52 | o changeset: 6:500cac37a696 | |
43 | | user: test |
|
53 | | user: test | |
44 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
54 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
45 | | summary: f |
|
55 | | summary: f | |
46 | | |
|
56 | | | |
47 |
o changeset: |
|
57 | o changeset: 5:7b4e2f4b7bcd | |
48 | | user: test |
|
58 | | user: test | |
49 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
59 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
50 | | summary: e |
|
60 | | summary: e | |
51 | | |
|
61 | | | |
52 |
o changeset: |
|
62 | o changeset: 4:00f1c5383965 | |
53 | | user: test |
|
63 | | user: test | |
54 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
55 | | summary: d |
|
65 | | summary: d | |
56 | | |
|
66 | | | |
57 |
o changeset: |
|
67 | o changeset: 3:65a9a84f33fd | |
58 | | user: test |
|
68 | | user: test | |
59 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
60 | | summary: c |
|
70 | | summary: c | |
61 | | |
|
71 | | | |
62 |
o changeset: |
|
72 | o changeset: 2:da6535b52e45 | |
63 | | user: test |
|
73 | | user: test | |
64 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
65 | | summary: b |
|
75 | | summary: b | |
66 | | |
|
76 | | | |
67 |
o changeset: |
|
77 | o changeset: 1:c1f09da44841 | |
|
78 | | user: test | |||
|
79 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
80 | | summary: a | |||
|
81 | | | |||
|
82 | o changeset: 0:1715188a53c7 | |||
68 | user: test |
|
83 | user: test | |
69 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 | date: Thu Jan 01 00:00:00 1970 +0000 | |
70 | summary: a |
|
85 | summary: Initial commit | |
71 |
|
86 | |||
72 |
|
87 | |||
73 | edit the history |
|
88 | edit the history | |
74 |
$ HGEDITOR="cat \"$EDITED\" > " hg histedit |
|
89 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle | |
75 |
|
|
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
91 | patching file e | |||
|
92 | Hunk #1 FAILED at 0 | |||
76 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
93 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
77 | abort: Fix up the change and run hg histedit --continue |
|
94 | abort: Fix up the change and run hg histedit --continue | |
78 |
|
95 | |||
79 | fix up |
|
96 | fix up | |
80 | $ echo a > e |
|
97 | $ echo a > e | |
81 | $ hg add e |
|
|||
82 | $ cat > cat.py <<EOF |
|
98 | $ cat > cat.py <<EOF | |
83 | > import sys |
|
99 | > import sys | |
84 | > print open(sys.argv[1]).read() |
|
100 | > print open(sys.argv[1]).read() | |
@@ -86,6 +102,7 b' fix up' | |||||
86 |
|
102 | |||
87 | > EOF |
|
103 | > EOF | |
88 |
$ |
|
104 | $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | |
|
105 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
89 | d |
|
106 | d | |
90 | *** |
|
107 | *** | |
91 | does not commute with e |
|
108 | does not commute with e | |
@@ -104,7 +121,8 b' fix up' | |||||
104 |
|
121 | |||
105 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
106 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
123 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | file e already exists |
|
124 | patching file e | |
|
125 | Hunk #1 FAILED at 0 | |||
108 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
126 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
109 | abort: Fix up the change and run hg histedit --continue |
|
127 | abort: Fix up the change and run hg histedit --continue | |
110 |
|
128 | |||
@@ -115,31 +133,36 b' just continue this time' | |||||
115 |
|
133 | |||
116 | log after edit |
|
134 | log after edit | |
117 | $ hg log --graph |
|
135 | $ hg log --graph | |
118 |
@ changeset: 4 |
|
136 | @ changeset: 5:45bd04206744 | |
119 | | tag: tip |
|
137 | | tag: tip | |
120 | | user: test |
|
138 | | user: test | |
121 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
139 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
122 | | summary: f |
|
140 | | summary: f | |
123 | | |
|
141 | | | |
124 |
o changeset: |
|
142 | o changeset: 4:abff6367c13a | |
125 | | user: test |
|
143 | | user: test | |
126 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
144 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
127 | | summary: d |
|
145 | | summary: d | |
128 | | |
|
146 | | | |
129 |
o changeset: |
|
147 | o changeset: 3:65a9a84f33fd | |
130 | | user: test |
|
148 | | user: test | |
131 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
149 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
132 | | summary: c |
|
150 | | summary: c | |
133 | | |
|
151 | | | |
134 |
o changeset: |
|
152 | o changeset: 2:da6535b52e45 | |
135 | | user: test |
|
153 | | user: test | |
136 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
154 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
137 | | summary: b |
|
155 | | summary: b | |
138 | | |
|
156 | | | |
139 |
o changeset: |
|
157 | o changeset: 1:c1f09da44841 | |
|
158 | | user: test | |||
|
159 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
160 | | summary: a | |||
|
161 | | | |||
|
162 | o changeset: 0:1715188a53c7 | |||
140 | user: test |
|
163 | user: test | |
141 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
164 | date: Thu Jan 01 00:00:00 1970 +0000 | |
142 | summary: a |
|
165 | summary: Initial commit | |
143 |
|
166 | |||
144 |
|
167 | |||
145 | contents of e |
|
168 | contents of e |
@@ -6,24 +6,20 b'' | |||||
6 | > histedit= |
|
6 | > histedit= | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 | $ EDITED="$TESTTMP/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 () |
|
9 | $ initrepo () | |
18 | > { |
|
10 | > { | |
19 | > hg init $1 |
|
11 | > hg init $1 | |
20 | > cd $1 |
|
12 | > cd $1 | |
21 | > for x in a b c d e f ; do |
|
13 | > for x in a b c d e f ; do | |
|
14 | > echo $x$x$x$x$x > $x | |||
|
15 | > hg add $x | |||
|
16 | > done | |||
|
17 | > hg ci -m 'Initial commit' | |||
|
18 | > for x in a b c d e f ; do | |||
22 | > echo $x > $x |
|
19 | > echo $x > $x | |
23 | > hg add $x |
|
|||
24 | > hg ci -m $x |
|
20 | > hg ci -m $x | |
25 | > done |
|
21 | > done | |
26 |
> echo a > |
|
22 | > echo 'I can haz no commute' > e | |
27 | > hg ci -m 'does not commute with e' |
|
23 | > hg ci -m 'does not commute with e' | |
28 | > cd .. |
|
24 | > cd .. | |
29 | > } |
|
25 | > } | |
@@ -31,48 +27,70 b'' | |||||
31 | $ initrepo r1 |
|
27 | $ initrepo r1 | |
32 | $ cd r1 |
|
28 | $ cd r1 | |
33 |
|
29 | |||
|
30 | Initial generation of the command files | |||
|
31 | ||||
|
32 | $ EDITED="$TESTTMP/editedhistory" | |||
|
33 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 3 >> $EDITED | |||
|
34 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 4 >> $EDITED | |||
|
35 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 7 >> $EDITED | |||
|
36 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 5 >> $EDITED | |||
|
37 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 6 >> $EDITED | |||
|
38 | $ cat $EDITED | |||
|
39 | pick 65a9a84f33fd 3 c | |||
|
40 | pick 00f1c5383965 4 d | |||
|
41 | pick 39522b764e3d 7 does not commute with e | |||
|
42 | pick 7b4e2f4b7bcd 5 e | |||
|
43 | pick 500cac37a696 6 f | |||
|
44 | ||||
34 | log before edit |
|
45 | log before edit | |
35 | $ hg log --graph |
|
46 | $ hg log --graph | |
36 |
@ changeset: |
|
47 | @ changeset: 7:39522b764e3d | |
37 | | tag: tip |
|
48 | | tag: tip | |
38 | | user: test |
|
49 | | user: test | |
39 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
50 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
40 | | summary: does not commute with e |
|
51 | | summary: does not commute with e | |
41 | | |
|
52 | | | |
42 |
o changeset: 5 |
|
53 | o changeset: 6:500cac37a696 | |
43 | | user: test |
|
54 | | user: test | |
44 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
45 | | summary: f |
|
56 | | summary: f | |
46 | | |
|
57 | | | |
47 |
o changeset: |
|
58 | o changeset: 5:7b4e2f4b7bcd | |
48 | | user: test |
|
59 | | user: test | |
49 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
50 | | summary: e |
|
61 | | summary: e | |
51 | | |
|
62 | | | |
52 |
o changeset: |
|
63 | o changeset: 4:00f1c5383965 | |
53 | | user: test |
|
64 | | user: test | |
54 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
55 | | summary: d |
|
66 | | summary: d | |
56 | | |
|
67 | | | |
57 |
o changeset: |
|
68 | o changeset: 3:65a9a84f33fd | |
58 | | user: test |
|
69 | | user: test | |
59 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
70 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
60 | | summary: c |
|
71 | | summary: c | |
61 | | |
|
72 | | | |
62 |
o changeset: |
|
73 | o changeset: 2:da6535b52e45 | |
63 | | user: test |
|
74 | | user: test | |
64 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
75 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
65 | | summary: b |
|
76 | | summary: b | |
66 | | |
|
77 | | | |
67 |
o changeset: |
|
78 | o changeset: 1:c1f09da44841 | |
|
79 | | user: test | |||
|
80 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
81 | | summary: a | |||
|
82 | | | |||
|
83 | o changeset: 0:1715188a53c7 | |||
68 | user: test |
|
84 | user: test | |
69 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:00 1970 +0000 | |
70 | summary: a |
|
86 | summary: Initial commit | |
71 |
|
87 | |||
72 |
|
88 | |||
73 | edit the history |
|
89 | edit the history | |
74 |
$ HGEDITOR="cat \"$EDITED\" > " hg histedit |
|
90 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle | |
75 |
|
|
91 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
92 | patching file e | |||
|
93 | Hunk #1 FAILED at 0 | |||
76 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
94 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
77 | abort: Fix up the change and run hg histedit --continue |
|
95 | abort: Fix up the change and run hg histedit --continue | |
78 |
|
96 | |||
@@ -84,55 +102,62 b' abort the edit' | |||||
84 | second edit set |
|
102 | second edit set | |
85 |
|
103 | |||
86 | $ hg log --graph |
|
104 | $ hg log --graph | |
87 |
@ changeset: |
|
105 | @ changeset: 7:39522b764e3d | |
88 | | tag: tip |
|
106 | | tag: tip | |
89 | | user: test |
|
107 | | user: test | |
90 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
108 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
91 | | summary: does not commute with e |
|
109 | | summary: does not commute with e | |
92 | | |
|
110 | | | |
93 |
o changeset: 5 |
|
111 | o changeset: 6:500cac37a696 | |
94 | | user: test |
|
112 | | user: test | |
95 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
113 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
96 | | summary: f |
|
114 | | summary: f | |
97 | | |
|
115 | | | |
98 |
o changeset: |
|
116 | o changeset: 5:7b4e2f4b7bcd | |
99 | | user: test |
|
117 | | user: test | |
100 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
101 | | summary: e |
|
119 | | summary: e | |
102 | | |
|
120 | | | |
103 |
o changeset: |
|
121 | o changeset: 4:00f1c5383965 | |
104 | | user: test |
|
122 | | user: test | |
105 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
123 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
106 | | summary: d |
|
124 | | summary: d | |
107 | | |
|
125 | | | |
108 |
o changeset: |
|
126 | o changeset: 3:65a9a84f33fd | |
109 | | user: test |
|
127 | | user: test | |
110 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
128 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
111 | | summary: c |
|
129 | | summary: c | |
112 | | |
|
130 | | | |
113 |
o changeset: |
|
131 | o changeset: 2:da6535b52e45 | |
114 | | user: test |
|
132 | | user: test | |
115 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
133 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
116 | | summary: b |
|
134 | | summary: b | |
117 | | |
|
135 | | | |
118 |
o changeset: |
|
136 | o changeset: 1:c1f09da44841 | |
|
137 | | user: test | |||
|
138 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
139 | | summary: a | |||
|
140 | | | |||
|
141 | o changeset: 0:1715188a53c7 | |||
119 | user: test |
|
142 | user: test | |
120 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
143 | date: Thu Jan 01 00:00:00 1970 +0000 | |
121 | summary: a |
|
144 | summary: Initial commit | |
122 |
|
145 | |||
123 |
|
146 | |||
124 | edit the history |
|
147 | edit the history | |
125 |
$ HGEDITOR="cat \"$EDITED\" > " hg histedit |
|
148 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle | |
126 |
|
|
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
150 | patching file e | |||
|
151 | Hunk #1 FAILED at 0 | |||
127 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
152 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
128 | abort: Fix up the change and run hg histedit --continue |
|
153 | abort: Fix up the change and run hg histedit --continue | |
129 |
|
154 | |||
130 | fix up |
|
155 | fix up | |
131 | $ echo a > e |
|
156 | $ echo 'I can haz no commute' > e | |
132 | $ hg add e |
|
|||
133 | $ hg histedit --continue 2>&1 | fixbundle |
|
157 | $ hg histedit --continue 2>&1 | fixbundle | |
134 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
158 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
135 | file e already exists |
|
159 | patching file e | |
|
160 | Hunk #1 FAILED at 0 | |||
136 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
161 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
137 | abort: Fix up the change and run hg histedit --continue |
|
162 | abort: Fix up the change and run hg histedit --continue | |
138 |
|
163 | |||
@@ -143,36 +168,41 b' just continue this time' | |||||
143 |
|
168 | |||
144 | log after edit |
|
169 | log after edit | |
145 | $ hg log --graph |
|
170 | $ hg log --graph | |
146 |
@ changeset: |
|
171 | @ changeset: 6:8e082d1a72ea | |
147 | | tag: tip |
|
172 | | tag: tip | |
148 | | user: test |
|
173 | | user: test | |
149 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
174 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
150 | | summary: f |
|
175 | | summary: f | |
151 | | |
|
176 | | | |
152 |
o changeset: |
|
177 | o changeset: 5:13b04d775b81 | |
153 | | user: test |
|
178 | | user: test | |
154 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
179 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
155 | | summary: does not commute with e |
|
180 | | summary: does not commute with e | |
156 | | |
|
181 | | | |
157 |
o changeset: |
|
182 | o changeset: 4:00f1c5383965 | |
158 | | user: test |
|
183 | | user: test | |
159 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
184 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
160 | | summary: d |
|
185 | | summary: d | |
161 | | |
|
186 | | | |
162 |
o changeset: |
|
187 | o changeset: 3:65a9a84f33fd | |
163 | | user: test |
|
188 | | user: test | |
164 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
189 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
165 | | summary: c |
|
190 | | summary: c | |
166 | | |
|
191 | | | |
167 |
o changeset: |
|
192 | o changeset: 2:da6535b52e45 | |
168 | | user: test |
|
193 | | user: test | |
169 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
194 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
170 | | summary: b |
|
195 | | summary: b | |
171 | | |
|
196 | | | |
172 |
o changeset: |
|
197 | o changeset: 1:c1f09da44841 | |
|
198 | | user: test | |||
|
199 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
200 | | summary: a | |||
|
201 | | | |||
|
202 | o changeset: 0:1715188a53c7 | |||
173 | user: test |
|
203 | user: test | |
174 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
204 | date: Thu Jan 01 00:00:00 1970 +0000 | |
175 | summary: a |
|
205 | summary: Initial commit | |
176 |
|
206 | |||
177 |
|
207 | |||
178 | start over |
|
208 | start over | |
@@ -181,25 +211,32 b' start over' | |||||
181 |
|
211 | |||
182 | $ initrepo r2 |
|
212 | $ initrepo r2 | |
183 | $ cd r2 |
|
213 | $ cd r2 | |
184 |
$ |
|
214 | $ rm $EDITED | |
185 | > pick 177f92b77385 c |
|
215 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 3 >> $EDITED | |
186 | > pick 055a42cdd887 d |
|
216 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 4 >> $EDITED | |
187 | > mess bfa474341cc9 does not commute with e |
|
217 | $ hg log --template 'mess {node|short} {rev} {desc}\n' -r 7 >> $EDITED | |
188 | > pick e860deea161a e |
|
218 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 5 >> $EDITED | |
189 | > pick 652413bf663e f |
|
219 | $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 6 >> $EDITED | |
190 | > EOF |
|
220 | $ cat $EDITED | |
|
221 | pick 65a9a84f33fd 3 c | |||
|
222 | pick 00f1c5383965 4 d | |||
|
223 | mess 39522b764e3d 7 does not commute with e | |||
|
224 | pick 7b4e2f4b7bcd 5 e | |||
|
225 | pick 500cac37a696 6 f | |||
191 |
|
226 | |||
192 | edit the history, this time with a fold action |
|
227 | edit the history, this time with a fold action | |
193 |
$ HGEDITOR="cat \"$EDITED\" > " hg histedit |
|
228 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle | |
194 |
|
|
229 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
230 | patching file e | |||
|
231 | Hunk #1 FAILED at 0 | |||
195 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
232 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
196 | abort: Fix up the change and run hg histedit --continue |
|
233 | abort: Fix up the change and run hg histedit --continue | |
197 |
|
234 | |||
198 | $ echo a > e |
|
235 | $ echo 'I can haz no commute' > e | |
199 | $ hg add e |
|
|||
200 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle |
|
236 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle | |
201 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
237 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
202 | file e already exists |
|
238 | patching file e | |
|
239 | Hunk #1 FAILED at 0 | |||
203 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
240 | 1 out of 1 hunks FAILED -- saving rejects to file e.rej | |
204 | abort: Fix up the change and run hg histedit --continue |
|
241 | abort: Fix up the change and run hg histedit --continue | |
205 | second edit also fails, but just continue |
|
242 | second edit also fails, but just continue | |
@@ -209,36 +246,41 b' second edit also fails, but just continu' | |||||
209 |
|
246 | |||
210 | post message fix |
|
247 | post message fix | |
211 | $ hg log --graph |
|
248 | $ hg log --graph | |
212 |
@ changeset: |
|
249 | @ changeset: 6:f14da722aa4b | |
213 | | tag: tip |
|
250 | | tag: tip | |
214 | | user: test |
|
251 | | user: test | |
215 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
252 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
216 | | summary: f |
|
253 | | summary: f | |
217 | | |
|
254 | | | |
218 |
o changeset: |
|
255 | o changeset: 5:382ff1adf0ed | |
219 | | user: test |
|
256 | | user: test | |
220 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
257 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
221 |
| summary: pick |
|
258 | | summary: pick 65a9a84f33fd 3 c | |
222 | | |
|
259 | | | |
223 |
o changeset: |
|
260 | o changeset: 4:00f1c5383965 | |
224 | | user: test |
|
261 | | user: test | |
225 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
262 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
226 | | summary: d |
|
263 | | summary: d | |
227 | | |
|
264 | | | |
228 |
o changeset: |
|
265 | o changeset: 3:65a9a84f33fd | |
229 | | user: test |
|
266 | | user: test | |
230 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
267 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
231 | | summary: c |
|
268 | | summary: c | |
232 | | |
|
269 | | | |
233 |
o changeset: |
|
270 | o changeset: 2:da6535b52e45 | |
234 | | user: test |
|
271 | | user: test | |
235 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
272 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
236 | | summary: b |
|
273 | | summary: b | |
237 | | |
|
274 | | | |
238 |
o changeset: |
|
275 | o changeset: 1:c1f09da44841 | |
|
276 | | user: test | |||
|
277 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
278 | | summary: a | |||
|
279 | | | |||
|
280 | o changeset: 0:1715188a53c7 | |||
239 | user: test |
|
281 | user: test | |
240 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
282 | date: Thu Jan 01 00:00:00 1970 +0000 | |
241 | summary: a |
|
283 | summary: Initial commit | |
242 |
|
284 | |||
243 |
|
285 | |||
244 |
$ |
|
286 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now