Mercurial > hg
view tests/test-copy-move-merge @ 11709:3e561b6af810 stable
mq: clarify the fact that qimport is trying to read a file
"hg qimport tip" would throw "abort: unable to read tip" before this.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sat, 31 Jul 2010 10:50:29 +0900 |
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