Provides output option to cat command # HG changeset patch # User thananck@yahoo.com # Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Provides output option to cat command expand function in commands.doexport is moved to toplevel and renamed to make_filename. The 'cat' command now accecpts --output <pattern> switch to specify the destination file. Index: hg/mercurial/commands.py ===================================================================

     1

#!/bin/sh

     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 up -m 1

    15

hg id

    16

grep -Ev ">>>|<<<" a

    17

hg status