Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-simple-update @ 5335:88e931f74e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:00:11 -0300
parents ad3d5b4367cb
children
line wrap: on
line source

#!/bin/sh

set -e

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest --debug