Mercurial > evolve
comparison tests/test-sharing.t @ 4490:7a5c6109ee84
branching: merge with test consolidation
Conflict were simple once isolated.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Apr 2019 16:59:28 +0200 |
| parents | 3caa4a459439 d02a7c8cdee5 |
| children | bdaf34903430 |
comparison
equal
deleted
inserted
replaced
| 4489:818e8190e867 | 4490:7a5c6109ee84 |
|---|---|
| 421 o 1:de6151c48e1c public fix bug 37 | 421 o 1:de6151c48e1c public fix bug 37 |
| 422 | | 422 | |
| 423 ~ | 423 ~ |
| 424 $ cd .. | 424 $ cd .. |
| 425 | 425 |
| 426 Setup for "cowboy mode" shared mutable history (to illustrate content- and | 426 Setup for shared mutable history (to illustrate content-divergence and |
| 427 phase-divergent changesets). | 427 phase-divergent changesets). |
| 428 | |
| 428 $ rm -rf review alice bob | 429 $ rm -rf review alice bob |
| 429 $ hg clone public alice | 430 $ hg clone public alice |
| 430 updating to branch default | 431 updating to branch default |
| 431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 432 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 432 $ hg clone public bob | 433 $ hg clone public bob |
| 444 $ echo 'pretty good fix' >> file1 | 445 $ echo 'pretty good fix' >> file1 |
| 445 $ hg commit -u bob -m 'fix bug 24 (v1)' | 446 $ hg commit -u bob -m 'fix bug 24 (v1)' |
| 446 $ hg shortlog -r . | 447 $ hg shortlog -r . |
| 447 4:2fe6c4bd32d0 draft fix bug 24 (v1) | 448 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
| 448 | 449 |
| 449 Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft | 450 Alice pulls Bob's draft changeset and amends it herself. :: |
| 450 changeset and amends it herself. :: | |
| 451 | 451 |
| 452 $ cd ../alice | 452 $ cd ../alice |
| 453 $ hg pull -u ../bob | 453 $ hg pull -u ../bob |
| 454 pulling from ../bob | 454 pulling from ../bob |
| 455 searching for changes | 455 searching for changes |