122 (see 'hg help evolution.instability') |
122 (see 'hg help evolution.instability') |
123 [255] |
123 [255] |
124 $ hg metaedit --user foobar |
124 $ hg metaedit --user foobar |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
126 $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden |
126 $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden |
|
127 5: test |
|
128 6: test |
127 7: test |
129 7: test |
128 8: foobar |
130 8: test |
|
131 9: foobar |
129 $ hg log --template '{rev}: {author}\n' -r . |
132 $ hg log --template '{rev}: {author}\n' -r . |
130 8: foobar |
133 9: foobar |
131 |
134 |
132 TODO: support this |
135 TODO: support this |
133 $ hg metaedit '.^::.' |
136 $ hg metaedit '.^::.' |
134 abort: editing multiple revisions without --fold is not currently supported |
137 abort: editing multiple revisions without --fold is not currently supported |
135 [255] |
138 [255] |
136 |
139 |
137 $ HGEDITOR=cat hg metaedit '.^::.' --fold --note 'folding changesets using metaedit, |
140 $ HGEDITOR=cat hg metaedit '.^::.' --fold --note 'folding changesets using metaedit, |
138 > and newlines' |
141 > and newlines' |
|
142 current hg version does not support storing note in obsmarker |
139 abort: note cannot contain a newline |
143 abort: note cannot contain a newline |
140 [255] |
144 [255] |
141 $ HGEDITOR=cat hg metaedit '.^::.' --fold --note "folding changesets using metaedit" |
145 $ HGEDITOR=cat hg metaedit '.^::.' --fold --note "folding changesets using metaedit" |
|
146 current hg version does not support storing note in obsmarker |
142 HG: This is a fold of 2 changesets. |
147 HG: This is a fold of 2 changesets. |
143 HG: Commit message of changeset 6. |
148 HG: Commit message of changeset 7. |
144 |
149 |
145 E |
150 E |
146 |
151 |
147 HG: Commit message of changeset 8. |
152 HG: Commit message of changeset 9. |
148 |
153 |
149 F |
154 F |
150 |
155 |
151 |
156 |
152 |
157 |
159 HG: added F |
164 HG: added F |
160 2 changesets folded |
165 2 changesets folded |
161 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
166 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
162 |
167 |
163 $ glog -r . |
168 $ glog -r . |
164 @ 9:a08d35fd7d9d@default(draft) E |
169 @ 10:a08d35fd7d9d@default(draft) E |
165 | |
170 | |
166 ~ |
171 ~ |
167 |
172 |
168 $ hg obslog -r . |
173 $ hg obslog -r . |
169 @ a08d35fd7d9d (9) E |
174 @ a08d35fd7d9d (10) E |
170 |\ |
175 |\ |
171 x | 212b2a2b87cd (8) F |
176 x | 212b2a2b87cd (9) F |
172 | | rewritten(description, user, parent, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
177 | | rewritten as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000) |
173 | | note: folding changesets using metaedit |
178 | | note: folding changesets using metaedit |
174 | | |
179 | | |
175 | x c2bd843aa246 (6) E |
180 | x c2bd843aa246 (7) E |
176 | rewritten(description, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
181 | rewritten as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000) |
177 | note: folding changesets using metaedit |
182 | note: folding changesets using metaedit |
178 | |
183 | |
179 x 587528abfffe (7) F |
184 x 587528abfffe (8) F |
180 rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
185 rewritten as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000) |
181 |
186 |
182 |
187 |
183 no new commit is created here because the date is the same |
188 no new commit is created here because the date is the same |
184 $ HGEDITOR=cat hg metaedit |
189 $ HGEDITOR=cat hg metaedit |
185 E |
190 E |
210 but highlight the bug) |
215 but highlight the bug) |
211 $ hg metaedit --config defaults.metaedit= --config devel.default-date="42 0" |
216 $ hg metaedit --config defaults.metaedit= --config devel.default-date="42 0" |
212 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
217 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
213 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
218 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
214 3: C |
219 3: C |
215 10: E |
220 11: E |
216 |
221 |
217 $ hg up .^ |
222 $ hg up .^ |
218 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
223 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
219 $ hg metaedit --user foobar2 tip |
224 $ hg metaedit --user foobar2 tip |
220 $ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden |
225 $ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden |
221 8: foobar |
226 9: foobar |
222 9: test |
|
223 10: test |
227 10: test |
224 11: foobar2 |
228 11: test |
|
229 12: foobar2 |
225 $ hg diff -r "10" -r "11" --hidden |
230 $ hg diff -r "10" -r "11" --hidden |
226 |
231 |
227 'fold' one commit |
232 'fold' one commit |
228 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U |
233 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U |
229 1 changesets folded |
234 1 changesets folded |
230 $ hg log -r "tip" --template '{rev}: {author}\n' |
235 $ hg log -r "tip" --template '{rev}: {author}\n' |
231 12: foobar3 |
236 13: foobar3 |