equal
deleted
inserted
replaced
1316 M unknown |
1316 M unknown |
1317 $ hg remove --force unknown |
1317 $ hg remove --force unknown |
1318 $ hg commit -qm "Remove unknown" |
1318 $ hg commit -qm "Remove unknown" |
1319 |
1319 |
1320 $ cd .. |
1320 $ cd .. |
|
1321 |
|
1322 We expects that non-bare shelve keeps newly created branch in |
|
1323 working directory. |
|
1324 |
|
1325 $ hg init shelve-preserve-new-branch |
|
1326 $ cd shelve-preserve-new-branch |
|
1327 $ echo "a" >> a |
|
1328 $ hg add a |
|
1329 $ echo "b" >> b |
|
1330 $ hg add b |
|
1331 $ hg commit -m "ab" |
|
1332 $ echo "aa" >> a |
|
1333 $ echo "bb" >> b |
|
1334 $ hg branch new-branch |
|
1335 marked working directory as branch new-branch |
|
1336 (branches are permanent and global, did you want a bookmark?) |
|
1337 $ hg status |
|
1338 M a |
|
1339 M b |
|
1340 $ hg branch |
|
1341 new-branch |
|
1342 $ hg shelve a |
|
1343 shelved as default |
|
1344 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1345 $ hg branch |
|
1346 new-branch |
|
1347 $ hg status |
|
1348 M b |
|
1349 $ touch "c" >> c |
|
1350 $ hg add c |
|
1351 $ hg status |
|
1352 M b |
|
1353 A c |
|
1354 $ hg shelve --exclude c |
|
1355 shelved as default-01 |
|
1356 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1357 $ hg branch |
|
1358 new-branch |
|
1359 $ hg status |
|
1360 A c |
|
1361 $ hg shelve --include c |
|
1362 shelved as default-02 |
|
1363 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1364 $ hg branch |
|
1365 new-branch |
|
1366 $ hg status |
|
1367 $ echo "d" >> d |
|
1368 $ hg add d |
|
1369 $ hg status |
|
1370 A d |
|
1371 |
|
1372 We expect that bare-shelve will not keep branch in current working directory. |
|
1373 |
|
1374 $ hg shelve |
|
1375 shelved as default-03 |
|
1376 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1377 $ hg branch |
|
1378 default |
|
1379 |