Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 5190:da1658d63647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move enabling of demandimport to dispatch.py This avoids loading many modules before enabling demandimport.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 17:33:27 -0300
parents 720ae5085ee3
children
line wrap: on
line source

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A