| changeset 19799 | ab3e42225dbc |
| parent 19798 | 76df01e56e7f |
| child 19801 | 41abe2e3e3b7 |
| 19798:76df01e56e7f | 19799:ab3e42225dbc |
|---|---|
31 or delete". |
31 or delete". |
32 |
32 |
33 Should abort: |
33 Should abort: |
34 |
34 |
35 $ hg update -y 1 |
35 $ hg update -y 1 |
36 abort: crosses branches (merge branches or use --clean to discard changes) |
36 abort: uncommitted changes |
37 (commit or update --clean to discard changes) |
|
37 [255] |
38 [255] |
38 $ mv c a |
39 $ mv c a |
39 |
40 |
40 Should succeed: |
41 Should succeed: |
41 |
42 |