templates/footer.tmpl
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 142 529bf610092e
child 1417 90b62337f8dd
permissions -rw-r--r--
[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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     1
</body>
529bf610092e Prettify the web interface
mpm@selenic.com
parents:
diff changeset
     2
</html>