equal
deleted
inserted
replaced
191 $ cd ../client |
191 $ cd ../client |
192 |
192 |
193 Topic will also affect rebase and merge destination. Let's pull the latest update from the main server:: |
193 Topic will also affect rebase and merge destination. Let's pull the latest update from the main server:: |
194 |
194 |
195 $ hg pull |
195 $ hg pull |
196 pulling from $TESTTMP/server |
196 pulling from $TESTTMP/server (glob) |
197 searching for changes |
197 searching for changes |
198 adding changesets |
198 adding changesets |
199 adding manifests |
199 adding manifests |
200 adding file changes |
200 adding file changes |
201 added 1 changesets with 1 changes to 1 files (+1 heads) |
201 added 1 changesets with 1 changes to 1 files (+1 heads) |
274 The topic information will fade out when we publish the changesets:: |
274 The topic information will fade out when we publish the changesets:: |
275 |
275 |
276 $ hg topic |
276 $ hg topic |
277 food |
277 food |
278 $ hg push |
278 $ hg push |
279 pushing to $TESTTMP/server |
279 pushing to $TESTTMP/server (glob) |
280 searching for changes |
280 searching for changes |
281 adding changesets |
281 adding changesets |
282 adding manifests |
282 adding manifests |
283 adding file changes |
283 adding file changes |
284 added 2 changesets with 2 changes to 1 files |
284 added 2 changesets with 2 changes to 1 files |
390 $ cd ../client |
390 $ cd ../client |
391 |
391 |
392 Lets see what other people did in the mean time:: |
392 Lets see what other people did in the mean time:: |
393 |
393 |
394 $ hg pull |
394 $ hg pull |
395 pulling from $TESTTMP/server |
395 pulling from $TESTTMP/server (glob) |
396 searching for changes |
396 searching for changes |
397 adding changesets |
397 adding changesets |
398 adding manifests |
398 adding manifests |
399 adding file changes |
399 adding file changes |
400 added 2 changesets with 2 changes to 1 files (+1 heads) |
400 added 2 changesets with 2 changes to 1 files (+1 heads) |
419 The "2 behind" is telling you that there is 2 new changesets on the named branch of the topic. You need to merge or rebase to incorporate them. |
419 The "2 behind" is telling you that there is 2 new changesets on the named branch of the topic. You need to merge or rebase to incorporate them. |
420 |
420 |
421 Pushing that topic would create a new heads will be prevented:: |
421 Pushing that topic would create a new heads will be prevented:: |
422 |
422 |
423 $ hg push --rev drinks |
423 $ hg push --rev drinks |
424 pushing to $TESTTMP/server |
424 pushing to $TESTTMP/server (glob) |
425 searching for changes |
425 searching for changes |
426 abort: push creates new remote head 70dfa201ed73! |
426 abort: push creates new remote head 70dfa201ed73! |
427 (merge or see "hg help push" for details about pushing new heads) |
427 (merge or see "hg help push" for details about pushing new heads) |
428 [255] |
428 [255] |
429 |
429 |
435 merging shopping |
435 merging shopping |
436 rebasing 10:70dfa201ed73 "Adding orange juice" |
436 rebasing 10:70dfa201ed73 "Adding orange juice" |
437 merging shopping |
437 merging shopping |
438 switching to topic tools |
438 switching to topic tools |
439 $ hg push |
439 $ hg push |
440 pushing to $TESTTMP/server |
440 pushing to $TESTTMP/server (glob) |
441 searching for changes |
441 searching for changes |
442 abort: push creates new remote head 4cd7c1591a67! |
442 abort: push creates new remote head 4cd7c1591a67! |
443 (merge or see "hg help push" for details about pushing new heads) |
443 (merge or see "hg help push" for details about pushing new heads) |
444 [255] |
444 [255] |
445 |
445 |
446 Publishing only one of them is allowed (as long as it does not create a new branch head has we just saw in the previous case):: |
446 Publishing only one of them is allowed (as long as it does not create a new branch head has we just saw in the previous case):: |
447 |
447 |
448 $ hg push -r drinks |
448 $ hg push -r drinks |
449 pushing to $TESTTMP/server |
449 pushing to $TESTTMP/server (glob) |
450 searching for changes |
450 searching for changes |
451 adding changesets |
451 adding changesets |
452 adding manifests |
452 adding manifests |
453 adding file changes |
453 adding file changes |
454 added 2 changesets with 2 changes to 1 files |
454 added 2 changesets with 2 changes to 1 files |