1198 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1198 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1199 $ hg update --hidden 'desc(B0)' |
1199 $ hg update --hidden 'desc(B0)' |
1200 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1200 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1201 working directory parent is obsolete! (0dec01379d3b) |
1201 working directory parent is obsolete! (0dec01379d3b) |
1202 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1202 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
1203 |
|
1204 Test output with pushed and pulled obs markers |
|
1205 ============================================== |
|
1206 |
|
1207 Test setup |
|
1208 ---------- |
|
1209 |
|
1210 $ hg init $TESTTMP/local-remote-markers-1 |
|
1211 $ cd $TESTTMP/local-remote-markers-1 |
|
1212 $ mkcommit ROOT |
|
1213 $ mkcommit A0 |
|
1214 $ hg log --hidden -G |
|
1215 @ changeset: 1:471f378eab4c |
|
1216 | tag: tip |
|
1217 | user: test |
|
1218 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1219 | summary: A0 |
|
1220 | |
|
1221 o changeset: 0:ea207398892e |
|
1222 user: test |
|
1223 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1224 summary: ROOT |
|
1225 |
|
1226 $ hg clone $TESTTMP/local-remote-markers-1 $TESTTMP/local-remote-markers-2 |
|
1227 updating to branch default |
|
1228 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1229 $ cd $TESTTMP/local-remote-markers-2 |
|
1230 $ hg log --hidden -G |
|
1231 @ changeset: 1:471f378eab4c |
|
1232 | tag: tip |
|
1233 | user: test |
|
1234 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1235 | summary: A0 |
|
1236 | |
|
1237 o changeset: 0:ea207398892e |
|
1238 user: test |
|
1239 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1240 summary: ROOT |
|
1241 |
|
1242 $ cd $TESTTMP/local-remote-markers-1 |
|
1243 $ hg amend -m "A1" |
|
1244 $ hg amend -m "A2" |
|
1245 $ hg log --hidden -G |
|
1246 @ changeset: 3:7a230b46bf61 |
|
1247 | tag: tip |
|
1248 | parent: 0:ea207398892e |
|
1249 | user: test |
|
1250 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1251 | summary: A2 |
|
1252 | |
|
1253 | x changeset: 2:fdf9bde5129a |
|
1254 |/ parent: 0:ea207398892e |
|
1255 | user: test |
|
1256 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1257 | summary: A1 |
|
1258 | |
|
1259 | x changeset: 1:471f378eab4c |
|
1260 |/ user: test |
|
1261 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1262 | summary: A0 |
|
1263 | |
|
1264 o changeset: 0:ea207398892e |
|
1265 user: test |
|
1266 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1267 summary: ROOT |
|
1268 |
|
1269 Actual test |
|
1270 ----------- |
|
1271 |
|
1272 $ hg debugobshistory 7a230b46bf61 |
|
1273 7a230b46bf61 (3) A2 |
|
1274 fdf9bde5129a (2) A1 |
|
1275 rewritten by test (*20*) as 7a230b46bf61 (glob) |
|
1276 471f378eab4c (1) A0 |
|
1277 rewritten by test (*20*) as fdf9bde5129a (glob) |
|
1278 $ cd $TESTTMP/local-remote-markers-2 |
|
1279 $ hg pull |
|
1280 pulling from $TESTTMP/local-remote-markers-1 |
|
1281 searching for changes |
|
1282 adding changesets |
|
1283 adding manifests |
|
1284 adding file changes |
|
1285 added 1 changesets with 0 changes to 1 files (+1 heads) |
|
1286 2 new obsolescence markers |
|
1287 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1288 working directory parent is obsolete! (471f378eab4c) |
|
1289 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
|
1290 $ hg debugobshistory 7a230b46bf61 --traceback |
|
1291 7a230b46bf61 (2) A2 |
|
1292 fdf9bde5129a |
|
1293 rewritten by test (*20*) as 7a230b46bf61 (glob) |
|
1294 471f378eab4c (1) A0 |
|
1295 rewritten by test (*20*) as fdf9bde5129a (glob) |
|
1296 $ hg debugobshistory 7a230b46bf61 --color=debug |
|
1297 [evolve.short_node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
|
1298 [evolve.short_node evolve.missing_change_ctx|fdf9bde5129a] |
|
1299 [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.short_node|7a230b46bf61] (glob) |
|
1300 [evolve.short_node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
|
1301 [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.short_node|fdf9bde5129a] (glob) |