Show More
@@ -940,3 +940,38 b' No superfluous rebuilding of cache:' | |||||
940 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| |
|
940 | 0010: 56 46 78 69 00 00 00 01 |VFxi....| | |
941 |
|
941 | |||
942 | $ cd .. |
|
942 | $ cd .. | |
|
943 | ||||
|
944 | Test to make sure that `--close-branch` only works on a branch head: | |||
|
945 | -------------------------------------------------------------------- | |||
|
946 | $ hg init closebranch | |||
|
947 | $ cd closebranch | |||
|
948 | $ for ch in a b c; do | |||
|
949 | > echo $ch > $ch | |||
|
950 | > hg add $ch | |||
|
951 | > hg ci -m "added "$ch | |||
|
952 | > done; | |||
|
953 | ||||
|
954 | $ hg up -r "desc('added b')" | |||
|
955 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
956 | ||||
|
957 | trying to close branch from a cset which is not a branch head | |||
|
958 | it should abort: | |||
|
959 | XXX: it should have aborted here | |||
|
960 | $ hg ci -m "closing branch" --close-branch | |||
|
961 | created new head | |||
|
962 | ||||
|
963 | $ hg up 0 | |||
|
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" | |||
|
966 | _ 3: 006876ddd20e closing branch | |||
|
967 | | default | |||
|
968 | | | |||
|
969 | | o 2: 155349b645be added c | |||
|
970 | |/ default | |||
|
971 | | | |||
|
972 | o 1: 5f6d8a4bf34a added b | |||
|
973 | | default | |||
|
974 | | | |||
|
975 | @ 0: 9092f1db7931 added a | |||
|
976 | default | |||
|
977 |
General Comments 0
You need to be logged in to leave comments.
Login now