comparison tests/test-split.t @ 5502:77c0ddd6f172 stable

split: use the last created commit as target for discard action
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 22 Aug 2020 07:24:46 +0800
parents 1896d6bc574b
children c706b96c71d8 e5d91fd1f319
comparison
equal deleted inserted replaced
5501:1896d6bc574b 5502:77c0ddd6f172
1314 > d 1314 > d
1315 > y 1315 > y
1316 > f 1316 > f
1317 > d 1317 > d
1318 > d 1318 > d
1319 > s
1320 > c
1321 > EOF 1319 > EOF
1322 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 1320 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1323 adding a 1321 adding a
1324 adding b 1322 adding b
1325 adding c 1323 adding c
1347 (enter ? for help) [Ynesfdaq?] d 1345 (enter ? for help) [Ynesfdaq?] d
1348 1346
1349 continue splitting? [Ycdq?] d 1347 continue splitting? [Ycdq?] d
1350 discarding remaining changes 1348 discarding remaining changes
1351 forgetting c 1349 forgetting c
1352 removing b
1353 diff --git a/b b/b
1354 deleted file mode 100644
1355 examine changes to 'b'?
1356 (enter ? for help) [Ynesfdaq?] s
1357
1358 no changes to record
1359 continue splitting? [Ycdq?] c
1360 1350
1361 $ hg glog -p 1351 $ hg glog -p
1362 @ 3:bdee57117c76 split3 (draft) 1352 @ 2:c2c6f4d8c766 split2 (draft)
1363 | diff --git a/b b/b
1364 | deleted file mode 100644
1365 | --- a/b
1366 | +++ /dev/null
1367 | @@ -1,1 +0,0 @@
1368 | -b
1369 |
1370 o 2:c2c6f4d8c766 split2 (draft)
1371 | diff --git a/b b/b 1353 | diff --git a/b b/b
1372 | new file mode 100644 1354 | new file mode 100644
1373 | --- /dev/null 1355 | --- /dev/null
1374 | +++ b/b 1356 | +++ b/b
1375 | @@ -0,0 +1,1 @@ 1357 | @@ -0,0 +1,1 @@