equal
deleted
inserted
replaced
954 $ hg up -r "desc('added b')" |
954 $ hg up -r "desc('added b')" |
955 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
955 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
956 |
956 |
957 trying to close branch from a cset which is not a branch head |
957 trying to close branch from a cset which is not a branch head |
958 it should abort: |
958 it should abort: |
959 XXX: it should have aborted here |
|
960 $ hg ci -m "closing branch" --close-branch |
959 $ hg ci -m "closing branch" --close-branch |
961 created new head |
960 abort: can only close branch heads |
|
961 [255] |
962 |
962 |
963 $ hg up 0 |
963 $ hg up 0 |
964 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
964 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
965 $ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" |
965 $ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" |
966 _ 3: 006876ddd20e closing branch |
966 o 2: 155349b645be added c |
967 | default |
967 | default |
968 | |
|
969 | o 2: 155349b645be added c |
|
970 |/ default |
|
971 | |
968 | |
972 o 1: 5f6d8a4bf34a added b |
969 o 1: 5f6d8a4bf34a added b |
973 | default |
970 | default |
974 | |
971 | |
975 @ 0: 9092f1db7931 added a |
972 @ 0: 9092f1db7931 added a |