Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
6349:6aaf5b1d8f15 | 6350:6aa4a3fa4e60 |
---|---|
10 echo This is file b22 > b | 10 echo This is file b22 > b |
11 hg commit -m"comment #1" -d "1000000 0" | 11 hg commit -m"comment #1" -d "1000000 0" |
12 hg update 0 | 12 hg update 0 |
13 rm b | 13 rm b |
14 hg commit -A -m"comment #2" -d "1000000 0" | 14 hg commit -A -m"comment #2" -d "1000000 0" |
15 mv a c | |
15 # in theory, we shouldn't need the "-y" below, but it prevents | 16 # in theory, we shouldn't need the "-y" below, but it prevents |
16 # this test from hanging when "hg update" erroneously prompts the | 17 # this test from hanging when "hg update" erroneously prompts the |
17 # user for "keep or delete" | 18 # user for "keep or delete" |
19 echo % should abort | |
20 hg update -y 1 | |
21 mv c a | |
22 echo % should succeed | |
18 hg update -y 1 | 23 hg update -y 1 |
19 | 24 |
20 exit 0 | 25 exit 0 |