equal
deleted
inserted
replaced
28 Test interrupted updates by having a non-empty dir with the same name as one |
28 Test interrupted updates by having a non-empty dir with the same name as one |
29 of the files in a commit we're updating to |
29 of the files in a commit we're updating to |
30 |
30 |
31 $ mkdir b && touch b/nonempty |
31 $ mkdir b && touch b/nonempty |
32 $ hg up |
32 $ hg up |
33 abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !) |
33 abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !) |
34 abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !) |
34 abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !) |
35 [255] |
35 [255] |
36 $ hg ci |
36 $ hg ci |
37 abort: last update was interrupted |
37 abort: last update was interrupted |
38 (use 'hg update' to get a consistent checkout) |
38 (use 'hg update' to get a consistent checkout) |