Show More
@@ -333,10 +333,10 b' def reposetup(ui, repo):' | |||||
333 | for f in sorted(ctx.added() + ctx.modified()): |
|
333 | for f in sorted(ctx.added() + ctx.modified()): | |
334 | if not self._eolfile(f): |
|
334 | if not self._eolfile(f): | |
335 | continue |
|
335 | continue | |
336 |
|
|
336 | fctx = ctx[f] | |
337 | data = ctx[f].data() |
|
337 | if fctx is None: | |
338 | except IOError: |
|
|||
339 | continue |
|
338 | continue | |
|
339 | data = fctx.data() | |||
340 | if util.binary(data): |
|
340 | if util.binary(data): | |
341 | # We should not abort here, since the user should |
|
341 | # We should not abort here, since the user should | |
342 | # be able to say "** = native" to automatically |
|
342 | # be able to say "** = native" to automatically |
@@ -525,4 +525,19 b' append a line without trailing newline' | |||||
525 | fourth |
|
525 | fourth | |
526 | fifth |
|
526 | fifth | |
527 |
|
527 | |||
|
528 | amend of changesets with renamed/deleted files expose new code paths | |||
|
529 | ||||
|
530 | $ hg mv a.txt b.txt | |||
|
531 | $ hg ci --amend -q | |||
|
532 | $ hg diff -c. | |||
|
533 | diff --git a/a.txt b/b.txt | |||
|
534 | rename from a.txt | |||
|
535 | rename to b.txt | |||
|
536 | --- a/a.txt | |||
|
537 | +++ b/b.txt | |||
|
538 | @@ -1,2 +1,3 @@ | |||
|
539 | third | |||
|
540 | fourth | |||
|
541 | +fifth | |||
|
542 | ||||
528 | $ cd .. |
|
543 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now