view tests/test-excessive-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, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
created new head
changeset:   4:f6c172c6198c
tag:         tip
parent:      1:448a8c5e42f1
parent:      2:7c5dc2e857f2
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     merge a/b -> blah

changeset:   3:13d875a22764
parent:      2:7c5dc2e857f2
parent:      1:448a8c5e42f1
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     merge b/a -> blah

changeset:   2:7c5dc2e857f2
parent:      0:dc1751ec2e9d
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     branch b

changeset:   1:448a8c5e42f1
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     branch a

changeset:   0:dc1751ec2e9d
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     test

   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      64      0       0 dc1751ec2e9d 000000000000 000000000000
     1        64      68      1       1 448a8c5e42f1 dc1751ec2e9d 000000000000
     2       132      68      2       2 7c5dc2e857f2 dc1751ec2e9d 000000000000
     3       200      75      3       3 13d875a22764 7c5dc2e857f2 448a8c5e42f1
     4       275      29      3       4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2

1
79d7492df40aa0fa093ec4209be78043c181f094 644   a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   b
2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   a
79d7492df40aa0fa093ec4209be78043c181f094 644   b
3
79d7492df40aa0fa093ec4209be78043c181f094 644   a
79d7492df40aa0fa093ec4209be78043c181f094 644   b
4
79d7492df40aa0fa093ec4209be78043c181f094 644   a
79d7492df40aa0fa093ec4209be78043c181f094 644   b

   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       6      1       1 79d7492df40a 2ed2a3912a0b 000000000000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 4 total revisions