Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-flags @ 3002:a31557193f3c
merge: simplify working dir manifest generation
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 22 Aug 2006 17:08:38 -0500 |
parents | e506c14382fd |
children | 455109df3669 |
line wrap: on
line source
#!/bin/sh -e umask 027 mkdir test1 cd test1 hg init touch a b hg add a b hg ci -m "added a b" -d "1000000 0" cd .. mkdir test2 cd test2 hg init hg pull ../test1 hg co chmod +x a hg ci -m "chmod +x a" -d "1000000 0" cd ../test1 echo 123 >>a hg ci -m "a updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge ls -l ../test[12]/a > foo cut -b 1-10 < foo