[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

#!/usr/bin/env python

     2

#

     3

# mercurial - a minimal scalable distributed SCM

     4

# v0.5b "katje"

     5

#

     6

# Copyright 2005 Matt Mackall <mpm@selenic.com>

     7

#

     8

# This software may be used and distributed according to the terms

     9

# of the GNU General Public License, incorporated herein by reference.

    10

    11

from mercurial import commands

    12

    13

commands.run()

    14