Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-sharing.t Wed Apr 10 16:40:58 2019 +0200 +++ b/tests/test-sharing.t Wed Apr 10 16:59:28 2019 +0200 @@ -423,8 +423,9 @@ ~ $ cd .. -Setup for "cowboy mode" shared mutable history (to illustrate content- and +Setup for shared mutable history (to illustrate content-divergence and phase-divergent changesets). + $ rm -rf review alice bob $ hg clone public alice updating to branch default @@ -446,8 +447,7 @@ $ hg shortlog -r . 4:2fe6c4bd32d0 draft fix bug 24 (v1) -Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft -changeset and amends it herself. :: +Alice pulls Bob's draft changeset and amends it herself. :: $ cd ../alice $ hg pull -u ../bob