Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

echo "added file1" > file1

     7

echo "added file2" > file2

     8

hg add file1 file2

     9

hg commit -m "added file1 and file2" -d "0 0" -u user

    10

echo "changed file1" >> file1

    11

hg commit -m "changed file1" -d "0 0" -u user

    12

hg -q log

    13

hg id

    14

hg update -C 0

    15

hg id

    16

echo "changed file1" >> file1

    17

hg id

    18

hg revert

    19

hg diff

    20

hg status

    21

hg id

    22

hg update

    23

hg diff

    24

hg status

    25

hg id

    26

hg update -C 0

    27

echo "changed file1" >> file1

    28

HGMERGE=merge hg update

    29

hg diff

    30

hg status

    31

hg id

    32

hg revert

    33

hg diff

    34

hg status

    35

hg id

    36

hg revert -r tip

    37

hg diff

    38

hg status

    39

hg id

    40

hg update -C

    41

hg diff

    42

hg status

    43

hg id

    44

cd ..; /bin/rm -rf t

    45