Mercurial > evolve
diff tests/test-sharing.t @ 4481:d02a7c8cdee5 stable
test: consolidate the content-divergent test cases
This commit move most of the content divergent related test in dedicated and
thematic test files.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 10 Apr 2019 14:32:00 +0200 |
parents | ab3581bc0637 |
children | 7978230faa32 7a5c6109ee84 |
line wrap: on
line diff
--- a/tests/test-sharing.t Tue Apr 09 21:16:49 2019 +0200 +++ b/tests/test-sharing.t Wed Apr 10 14:32:00 2019 +0200 @@ -423,7 +423,7 @@ ~ $ cd .. -Setup for "cowboy mode" shared mutable history (to illustrate divergent +Setup for shared mutable history (to illustrate divergent and bumped changesets). $ rm -rf review alice bob $ hg clone public alice @@ -446,8 +446,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