Mercurial > evolve
comparison tests/test-tutorial.t @ 4577:bcd52ce0916d
evolve: don't update after instability resolution by default (BC)
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 24 Apr 2019 15:59:02 +0200 |
| parents | 96ce1030d2fb |
| children | 3ef96578da43 |
comparison
equal
deleted
inserted
replaced
| 4576:96ce1030d2fb | 4577:bcd52ce0916d |
|---|---|
| 1377 | 1377 |
| 1378 $ hg evolve | 1378 $ hg evolve |
| 1379 move:[13] animals | 1379 move:[13] animals |
| 1380 atop:[12] bathroom stuff | 1380 atop:[12] bathroom stuff |
| 1381 merging shopping | 1381 merging shopping |
| 1382 working directory is now at 2a2b36e14660 | |
| 1383 | 1382 |
| 1384 The old version of bathroom is hidden again. | 1383 The old version of bathroom is hidden again. |
| 1385 | 1384 |
| 1386 $ hg log -G | 1385 $ hg log -G |
| 1387 @ 2a2b36e14660 (draft): animals | 1386 o 2a2b36e14660 (draft): animals |
| 1388 | | 1387 | |
| 1389 o 682004e81e71 (draft): bathroom stuff | 1388 @ 682004e81e71 (draft): bathroom stuff |
| 1390 | | 1389 | |
| 1391 o 57e9caedbcb8 (public): SPAM SPAM | 1390 o 57e9caedbcb8 (public): SPAM SPAM |
| 1392 | | 1391 | |
| 1393 o 41aff6a42b75 (public): adding fruit | 1392 o 41aff6a42b75 (public): adding fruit |
| 1394 | | 1393 | |
| 1396 | | 1395 | |
| 1397 o 9ca060c80d74 (public): SPAM | 1396 o 9ca060c80d74 (public): SPAM |
| 1398 | | 1397 | |
| 1399 o 7e82d3f3c2cb (public): Monthy Python Shopping list | 1398 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
| 1400 | 1399 |
| 1400 | |
| 1401 And let's update to the newly evolved changeset. | |
| 1402 | |
| 1403 $ hg update | |
| 1404 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 1401 | 1405 |
| 1402 #if docgraph-ext | 1406 #if docgraph-ext |
| 1403 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore | 1407 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
| 1404 .. graphviz:: | 1408 .. graphviz:: |
| 1405 | 1409 |