Mercurial > public > mercurial-scm > hg

view tests/test-copy-move-merge @ 11413:4c1fe996838c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: reduce number of opts.get calls Rename outgoing() function to getoutgoing() analogous to getbundle() etc. to avoid name conflict.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 16 Jun 2010 00:37:21 +0200
parents 8d9bdcbb2b18
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c