Mercurial > hg
diff tests/test-merge5 @ 6350:6aa4a3fa4e60
update: no -C needed to switch branches without outstanding changes
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 22 Mar 2008 13:30:08 -0500 |
parents | fffc8a733bf9 |
children |
line wrap: on
line diff
--- a/tests/test-merge5 Sat Mar 22 19:01:09 2008 +0100 +++ b/tests/test-merge5 Sat Mar 22 13:30:08 2008 -0500 @@ -12,9 +12,14 @@ hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" +mv a c # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" +echo % should abort +hg update -y 1 +mv c a +echo % should succeed hg update -y 1 exit 0