Show More
@@ -363,12 +363,7 b' def finishfold(ui, repo, ctx, oldctx, ne' | |||
|
363 | 363 | hg.update(repo, parent) |
|
364 | 364 | ### prepare new commit data |
|
365 | 365 | commitopts = opts.copy() |
|
366 | # username | |
|
367 | if ctx.user() == oldctx.user(): | |
|
368 | username = ctx.user() | |
|
369 | else: | |
|
370 | username = ui.username() | |
|
371 | commitopts['user'] = username | |
|
366 | commitopts['user'] = ctx.user() | |
|
372 | 367 | # commit message |
|
373 | 368 | if opts.get('rollup'): |
|
374 | 369 | newmessage = ctx.description() |
@@ -1125,6 +1125,7 b' class TestResult(unittest._TextTestResul' | |||
|
1125 | 1125 | self.stream.write('\nERROR: %s output changed\n' % test) |
|
1126 | 1126 | |
|
1127 | 1127 | self.stream.write('!') |
|
1128 | self.stream.flush() | |
|
1128 | 1129 | iolock.release() |
|
1129 | 1130 | |
|
1130 | 1131 | def addSuccess(self, test): |
@@ -213,6 +213,44 b' check saving last-message.txt' | |||
|
213 | 213 | check saving last-message.txt |
|
214 | 214 | |
|
215 | 215 | $ cd .. |
|
216 | $ rm -r r | |
|
217 | ||
|
218 | folding preserves initial author | |
|
219 | -------------------------------- | |
|
220 | ||
|
221 | $ initrepo | |
|
222 | ||
|
223 | $ hg ci --user "someone else" --amend --quiet | |
|
224 | ||
|
225 | tip before edit | |
|
226 | $ hg log --rev . | |
|
227 | changeset: 5:a00ad806cb55 | |
|
228 | tag: tip | |
|
229 | user: someone else | |
|
230 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
231 | summary: f | |
|
232 | ||
|
233 | ||
|
234 | $ hg histedit e860deea161a --commands - 2>&1 <<EOF | fixbundle | |
|
235 | > pick e860deea161a e | |
|
236 | > fold a00ad806cb55 f | |
|
237 | > EOF | |
|
238 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
239 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
240 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
241 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
242 | ||
|
243 | tip after edit | |
|
244 | $ hg log --rev . | |
|
245 | changeset: 4:698d4e8040a1 | |
|
246 | tag: tip | |
|
247 | user: test | |
|
248 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
249 | summary: e | |
|
250 | ||
|
251 | ||
|
252 | $ cd .. | |
|
253 | $ rm -r r | |
|
216 | 254 | |
|
217 | 255 | folding and creating no new change doesn't break: |
|
218 | 256 | ------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now