equal
deleted
inserted
replaced
1423 | user: test |
1423 | user: test |
1424 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1424 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1425 summary: add A to bars |
1425 summary: add A to bars |
1426 |
1426 |
1427 #endif |
1427 #endif |
|
1428 |
|
1429 $ hg unshelve --continue |
|
1430 abort: no unshelve in progress |
|
1431 [255] |
|
1432 |
|
1433 $ hg shelve --list |
|
1434 default-01 (*)* changes to: add A to bars (glob) |
|
1435 default (*)* changes to: add B to foo (glob) |
|
1436 $ hg unshelve -n default-01 -i <<EOF |
|
1437 > y |
|
1438 > y |
|
1439 > EOF |
|
1440 temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
1441 rebasing shelved changes |
|
1442 diff --git a/bar2 b/bar2 |
|
1443 1 hunks, 1 lines changed |
|
1444 examine changes to 'bar2'? |
|
1445 (enter ? for help) [Ynesfdaq?] y |
|
1446 |
|
1447 @@ -1,2 +1,3 @@ |
|
1448 A |
|
1449 +B |
|
1450 C |
|
1451 record this change to 'bar2'? |
|
1452 (enter ? for help) [Ynesfdaq?] y |
|
1453 |