Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
1262:eff1acc2511c | 1263:eb0a1d1d499b |
---|---|
141 adding file changes | 141 adding file changes |
142 added 1 changesets with 1 changes to 1 files | 142 added 1 changesets with 1 changes to 1 files |
143 pushing 4 obsolescence markers (* bytes) (glob) | 143 pushing 4 obsolescence markers (* bytes) (glob) |
144 4 obsolescence markers added | 144 4 obsolescence markers added |
145 | 145 |
146 Now that the fix is public, we cannot amend it any more. | |
147 $ hg amend -m 'fix bug 37' | |
148 abort: cannot amend public changesets | |
149 [255] | |
150 | |
146 Figure SG05 | 151 Figure SG05 |
147 $ hg -R ../public shortlog -G | 152 $ hg -R ../public shortlog -G |
148 o 1:de6151c48e1c public fix bug 37 | 153 o 1:de6151c48e1c public fix bug 37 |
149 | | 154 | |
150 o 0:0dc9c9f6ab91 public create new project | 155 o 0:0dc9c9f6ab91 public create new project |
151 | 156 |
152 Oops, still have draft changesets in dev-repo. | 157 Oops, still have draft changesets in dev-repo: push the phase change there. |
153 $ cd ../dev-repo | 158 $ hg -R ../dev-repo shortlog -r 'draft()' |
154 $ hg shortlog -r 'draft()' | |
155 4:de6151c48e1c draft fix bug 37 | 159 4:de6151c48e1c draft fix bug 37 |
156 $ hg pull -u | 160 $ hg push ../dev-repo |
157 pulling from $TESTTMP/test-repo | 161 pushing to ../dev-repo |
158 searching for changes | 162 searching for changes |
159 no changes found | 163 no changes found |
160 pull obsolescence markers | 164 pushing 4 obsolescence markers (* bytes) (glob) |
161 0 obsolescence markers added | 165 0 obsolescence markers added |
162 $ hg shortlog -r 'draft()' | 166 [1] |
167 $ hg -R ../dev-repo shortlog -r 'draft()' | |
163 | 168 |
164 Sharing with multiple developers: code review | 169 Sharing with multiple developers: code review |
165 | 170 |
166 $ cd .. | 171 $ cd .. |
167 $ hg clone public review | 172 $ hg clone public review |