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 |
|
129 7: test |
127 7: test |
130 8: test |
128 8: foobar |
131 9: foobar |
|
132 $ hg log --template '{rev}: {author}\n' -r . |
129 $ hg log --template '{rev}: {author}\n' -r . |
133 9: foobar |
130 8: foobar |
134 |
131 |
135 TODO: support this |
132 TODO: support this |
136 $ hg metaedit '.^::.' |
133 $ hg metaedit '.^::.' |
137 abort: editing multiple revisions without --fold is not currently supported |
134 abort: editing multiple revisions without --fold is not currently supported |
138 [255] |
135 [255] |
139 |
136 |
140 $ HGEDITOR=cat hg metaedit '.^::.' --fold |
137 $ HGEDITOR=cat hg metaedit '.^::.' --fold |
141 HG: This is a fold of 2 changesets. |
138 HG: This is a fold of 2 changesets. |
142 HG: Commit message of changeset 7. |
139 HG: Commit message of changeset 6. |
143 |
140 |
144 E |
141 E |
145 |
142 |
146 HG: Commit message of changeset 9. |
143 HG: Commit message of changeset 8. |
147 |
144 |
148 F |
145 F |
149 |
146 |
150 |
147 |
151 |
148 |
158 HG: added F |
155 HG: added F |
159 2 changesets folded |
156 2 changesets folded |
160 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 |
158 |
162 $ glog -r . |
159 $ glog -r . |
163 @ 10:a08d35fd7d9d@default(draft) E |
160 @ 9:a08d35fd7d9d@default(draft) E |
164 | |
161 | |
165 ~ |
162 ~ |
166 |
163 |
167 no new commit is created here because the date is the same |
164 no new commit is created here because the date is the same |
168 $ HGEDITOR=cat hg metaedit |
165 $ HGEDITOR=cat hg metaedit |
194 but highlight the bug) |
191 but highlight the bug) |
195 $ hg metaedit --config defaults.metaedit= --config devel.default-date="42 0" |
192 $ hg metaedit --config defaults.metaedit= --config devel.default-date="42 0" |
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
193 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
197 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
194 $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n' |
198 3: C |
195 3: C |
199 11: E |
196 10: E |
200 |
197 |
201 $ hg up .^ |
198 $ hg up .^ |
202 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
199 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
203 $ hg metaedit --user foobar2 tip |
200 $ hg metaedit --user foobar2 tip |
204 $ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden |
201 $ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden |
205 9: foobar |
202 8: foobar |
|
203 9: test |
206 10: test |
204 10: test |
207 11: test |
205 11: foobar2 |
208 12: foobar2 |
|
209 $ hg diff -r "10" -r "11" --hidden |
206 $ hg diff -r "10" -r "11" --hidden |
210 |
207 |
211 'fold' one commit |
208 'fold' one commit |
212 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U --config |
209 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U --config |
213 1 changesets folded |
210 1 changesets folded |
214 $ hg log -r "tip" --template '{rev}: {author}\n' |
211 $ hg log -r "tip" --template '{rev}: {author}\n' |
215 13: foobar3 |
212 12: foobar3 |