view tests/test-copy-move-merge.out @ 11638:79231258503b stable

transplant: crash if repo.commit() finds nothing to commit

(makes issue2135, issue2264 more obvious, but does nothing to fix
either one)

This seems to happen in two distinct cases:
  * patch.patch() claims success but changes nothing (e.g.
    the transplanted changeset adds an empty file that already
    exists)
  * patch.patch() makes changes, but repo.status() fails to report them

Both of these seem like bugs in other parts of Mercurial, so arguably
it's not transplant's job to detect the failure to commit.  However:
  * detecting the problem as soon as possible is desirable
  * it prevents a more obscure crash later, in transplants.write()
  * there might be other lurking (or future) bugs that cause
    repo.commit() to do nothing

Also, in the case of issue2264 (source changesets silently dropped by
transplant), the only way to spot the problem currently is the crash
in transplants.write().  Failure to transplant a patch should abort
immediately, whether it's user error (patch does not apply) or a
Mercurial bug (e.g. repo.status() failing to report changes).

1 files updated, 0 files merged, 2 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in other:
   b
   c
  all copies found (* = to merge, ! = divergent):
   c -> a *
   b -> a *
  checking for directory renames
resolving manifests
 overwrite None partial False
 ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
 a: remote moved to c -> m
 a: remote moved to b -> m
preserving a for resolve of b
preserving a for resolve of c
removing a
update: a 1/2 files (50.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
 premerge successful
update: a 2/2 files (100.00%)
picked tool 'internal:merge' for c (binary False symlink False)
merging a and c to c
my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
 premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-- b --
0
1
2
-- c --
0
1
2