Improvements for hg identify: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Improvements for hg identify: Don't add the modified flag if unknown files are found. Remove extra space if there was no tag found. Multiple tags for a single parent separated by '/'. Getting rid of sum() to aid porting to Python 2.2. manifest hash: f91224afcb239908ba3ef02299fcf2b0380ebd1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCspWvW7P1GVgWeRoRAnqbAJwL1DIzOxOrdqpPj9vsYJeeiq+VrQCcCyli P+b/S0s2n628ku1IfrW3Elo= =lgRY -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

set -x

     4

hg init

     5

echo "nothing" > a

     6

hg add a

     7

hg commit -t ancestor -u test -d "0 0"

     8

echo "something" > a

     9

hg commit -t branch1 -u test -d "0 0"

    10

hg co 0

    11

echo "something else" > a

    12

hg commit -t branch2 -u test -d "0 0"

    13

export HGMERGE=merge

    14

hg -d up -m 1

    15

hg id

    16

cat a | grep -v ">>>" | grep -v "<<<"

    17

hg status