Mercurial > hg
view tests/test-issue352 @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
parents | f4c9bb4ad7b1 |
children | 08d31e43592a |
line wrap: on
line source
#!/bin/bash # http://www.selenic.com/mercurial/bts/issue352 hg init foo cd foo A=`echo -e -n 'he\rllo'` echo foo > "hell o" echo foo > "$A" hg add hg ci -A -m m rm "$A" ls hg add # BUG ? we don't walk on filenames with '\n' (regexp related) ? hg debugwalk hg ci -A -m m exit 0