Mercurial > hg
comparison tests/test-shelve.t @ 42733:d684449eef67
unshelve: forget unknown files after a partial unshelve
This is a follow-up patch to 6957f7b93e03. This allows hg to forget
unknown files after a partial unshelve.
Differential Revision: https://phab.mercurial-scm.org/D6724
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Tue, 13 Aug 2019 22:48:05 +0530 |
parents | 6957f7b93e03 |
children | 5c285c8e4f98 |
comparison
equal
deleted
inserted
replaced
42732:6d61be152c55 | 42733:d684449eef67 |
---|---|
1270 $ cat > foo <<EOF | 1270 $ cat > foo <<EOF |
1271 > A | 1271 > A |
1272 > B | 1272 > B |
1273 > C | 1273 > C |
1274 > EOF | 1274 > EOF |
1275 $ hg shelve | 1275 $ echo > garbage |
1276 $ hg st | |
1277 M foo | |
1278 ? garbage | |
1279 $ hg shelve --unknown | |
1276 shelved as default | 1280 shelved as default |
1277 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1281 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1278 $ cat foo | 1282 $ cat foo |
1279 B | 1283 B |
1280 $ hg unshelve -i <<EOF | 1284 $ hg unshelve -i <<EOF |
1281 > y | 1285 > y |
1282 > y | 1286 > y |
1283 > n | 1287 > n |
1288 > y | |
1289 > y | |
1284 > EOF | 1290 > EOF |
1285 unshelving change 'default' | 1291 unshelving change 'default' |
1286 rebasing shelved changes | 1292 rebasing shelved changes |
1287 diff --git a/foo b/foo | 1293 diff --git a/foo b/foo |
1288 2 hunks, 2 lines changed | 1294 2 hunks, 2 lines changed |
1290 (enter ? for help) [Ynesfdaq?] y | 1296 (enter ? for help) [Ynesfdaq?] y |
1291 | 1297 |
1292 @@ -1,1 +1,2 @@ | 1298 @@ -1,1 +1,2 @@ |
1293 +A | 1299 +A |
1294 B | 1300 B |
1295 record change 1/2 to 'foo'? | 1301 record change 1/3 to 'foo'? |
1296 (enter ? for help) [Ynesfdaq?] y | 1302 (enter ? for help) [Ynesfdaq?] y |
1297 | 1303 |
1298 @@ -1,1 +2,2 @@ | 1304 @@ -1,1 +2,2 @@ |
1299 B | 1305 B |
1300 +C | 1306 +C |
1301 record change 2/2 to 'foo'? | 1307 record change 2/3 to 'foo'? |
1302 (enter ? for help) [Ynesfdaq?] n | 1308 (enter ? for help) [Ynesfdaq?] n |
1303 | 1309 |
1310 diff --git a/garbage b/garbage | |
1311 new file mode 100644 | |
1312 examine changes to 'garbage'? | |
1313 (enter ? for help) [Ynesfdaq?] y | |
1314 | |
1315 @@ -0,0 +1,1 @@ | |
1316 + | |
1317 record change 3/3 to 'garbage'? | |
1318 (enter ? for help) [Ynesfdaq?] y | |
1319 | |
1320 $ hg st | |
1321 M foo | |
1322 ? garbage | |
1304 $ cat foo | 1323 $ cat foo |
1305 A | 1324 A |
1306 B | 1325 B |
1307 $ hg shelve --patch | 1326 $ hg shelve --patch |
1308 default (*s ago) changes to: add B to foo (glob) | 1327 default (*s ago) changes to: add B to foo (glob) |