Mercurial > evolve
diff tests/test-sharing.t @ 1263:eb0a1d1d499b stable
docs: sharing guide: clarify end-game of "Example 2"
- push to dev-repo, rather than pulling into it (consistent
with how we work the multiple developer scenario later)
- explicitly demonstrate that public changesets are immutable
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Tue, 14 Apr 2015 12:55:04 -0400 |
parents | 56cc2eb5995a |
children | 14f91037d2f6 |
line wrap: on
line diff
--- a/tests/test-sharing.t Sun Jun 15 21:17:09 2014 -0400 +++ b/tests/test-sharing.t Tue Apr 14 12:55:04 2015 -0400 @@ -143,23 +143,28 @@ pushing 4 obsolescence markers (* bytes) (glob) 4 obsolescence markers added +Now that the fix is public, we cannot amend it any more. + $ hg amend -m 'fix bug 37' + abort: cannot amend public changesets + [255] + Figure SG05 $ hg -R ../public shortlog -G o 1:de6151c48e1c public fix bug 37 | o 0:0dc9c9f6ab91 public create new project -Oops, still have draft changesets in dev-repo. - $ cd ../dev-repo - $ hg shortlog -r 'draft()' +Oops, still have draft changesets in dev-repo: push the phase change there. + $ hg -R ../dev-repo shortlog -r 'draft()' 4:de6151c48e1c draft fix bug 37 - $ hg pull -u - pulling from $TESTTMP/test-repo + $ hg push ../dev-repo + pushing to ../dev-repo searching for changes no changes found - pull obsolescence markers + pushing 4 obsolescence markers (* bytes) (glob) 0 obsolescence markers added - $ hg shortlog -r 'draft()' + [1] + $ hg -R ../dev-repo shortlog -r 'draft()' Sharing with multiple developers: code review