equal
deleted
inserted
replaced
1146 | | |
1146 | | |
1147 o | 19:10ffdd7e3cc9@default(draft) add gg |
1147 o | 19:10ffdd7e3cc9@default(draft) add gg |
1148 |/ |
1148 |/ |
1149 o 18:0bb66d4c1968@default(draft) a3 |
1149 o 18:0bb66d4c1968@default(draft) a3 |
1150 | |
1150 | |
|
1151 |
|
1152 Check that fold respects the allowunstable option |
|
1153 $ hg up 0bb66d4c1968 |
|
1154 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1155 $ mkcommit unstableifparentisfolded |
|
1156 created new head |
|
1157 $ glog -r "18::" |
|
1158 @ 30:30ecefd67c0a@default(draft) add unstableifparentisfolded |
|
1159 | |
|
1160 | o 29:5a6c53544778@default(draft) add c5_ |
|
1161 | | |
|
1162 +---o 20:db3d894869b0@default(draft) add gh |
|
1163 | | |
|
1164 | o 19:10ffdd7e3cc9@default(draft) add gg |
|
1165 |/ |
|
1166 o 18:0bb66d4c1968@default(draft) a3 |
|
1167 | |
|
1168 |
|
1169 $ hg fold --exact "19 + 18" |
|
1170 abort: cannot fold chain not ending with a head or with branching |
|
1171 [255] |
|
1172 $ hg fold --exact "18::29" |
|
1173 abort: cannot fold chain not ending with a head or with branching |
|
1174 [255] |
|
1175 $ hg fold --exact "19::" |
|
1176 2 changesets folded |