Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-encode @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 7544700fd931 |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init cat > .hg/hgrc <<EOF [encode] *.gz = gunzip [decode] *.gz = gzip EOF echo "this is a test" | gzip > a.gz hg add a.gz hg ci -m "test" -d "1000000 0" echo %% no changes hg status touch a.gz echo %% no changes hg status echo %% uncompressed contents in repo hg debugdata .hg/data/a.gz.d 0 echo %% uncompress our working dir copy gunzip < a.gz rm a.gz hg co echo %% uncompress our new working dir copy gunzip < a.gz