[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----

     1

requesting all changes

     2

adding changesets

     3

abort: error 111: Connection refused

     4

transaction abort!

     5

rollback completed

     6

checking changesets

     7

checking manifests

     8

crosschecking files in changesets and manifests

     9

checking files

    10

0 files, 0 changesets, 0 total revisions

    11

cat: foo: No such file or directory

    12

requesting all changes

    13

adding changesets

    14

abort: HTTP Error 404: File not found

    15

transaction abort!

    16

rollback completed

    17

checking changesets

    18

checking manifests

    19

crosschecking files in changesets and manifests

    20

checking files

    21

0 files, 0 changesets, 0 total revisions

    22

cat: foo: No such file or directory