merge: before cd/dc prompt, check that changed side really changed Before, merging would in some cases ask "wrong" questions about "changed/deleted" conflicts ... and even do it before the resolve phase where they can be postponed, re"resolved" or answered in bulk operations. Instead, check that the content of the changed file really did change. Reading and comparing file content is expensive and should be avoided before the resolve phase. Prompting the user is however even more expensive. Checking the content here is thus better. The 'f in ancestors[0]' should not be necessary but is included to be extra safe.

     1

Mercurial

     2

=========

     3

     4

Mercurial is a fast, easy to use, distributed revision control tool

     5

for software developers.

     6

     7

Basic install:

     8

     9

 $ make            # see install targets

    10

 $ make install    # do a system-wide install

    11

 $ hg debuginstall # sanity-check setup

    12

 $ hg              # see help

    13

    14

Running without installing:

    15

    16

 $ make local      # build for inplace usage

    17

 $ ./hg --version  # should show the latest version

    18

    19

See http://mercurial.selenic.com/ for detailed installation

    20

instructions, platform-specific notes, and Mercurial user information.