Show More
@@ -168,6 +168,7 class bundlerepository(localrepo.localre | |||||
168 | self._tempparent = tempfile.mkdtemp() |
|
168 | self._tempparent = tempfile.mkdtemp() | |
169 | localrepo.instance(ui, self._tempparent, 1) |
|
169 | localrepo.instance(ui, self._tempparent, 1) | |
170 | localrepo.localrepository.__init__(self, ui, self._tempparent) |
|
170 | localrepo.localrepository.__init__(self, ui, self._tempparent) | |
|
171 | self.ui.setconfig('phases', 'publish', False) | |||
171 |
|
172 | |||
172 | if path: |
|
173 | if path: | |
173 | self._url = 'bundle:' + util.expandpath(path) + '+' + bundlename |
|
174 | self._url = 'bundle:' + util.expandpath(path) + '+' + bundlename |
@@ -465,6 +465,38 initial setup | |||||
465 | o 0 public a-A - 054250a37db4 |
|
465 | o 0 public a-A - 054250a37db4 | |
466 |
|
466 | |||
467 |
|
467 | |||
|
468 | Pulling from bundle does not alter phases of changeset not present in the bundle | |||
|
469 | ||||
|
470 | $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg | |||
|
471 | 5 changesets found | |||
|
472 | $ hg pull ../partial-bundle.hg | |||
|
473 | pulling from ../partial-bundle.hg | |||
|
474 | searching for changes | |||
|
475 | no changes found | |||
|
476 | $ hgph | |||
|
477 | @ 10 draft a-H - 967b449fbc94 | |||
|
478 | | | |||
|
479 | | o 9 draft a-G - 3e27b6f1eee1 | |||
|
480 | | | | |||
|
481 | | o 8 draft a-F - b740e3e5c05d | |||
|
482 | | | | |||
|
483 | | o 7 draft a-E - e9f537e46dea | |||
|
484 | | | | |||
|
485 | +---o 6 public n-B - 145e75495359 | |||
|
486 | | | | |||
|
487 | o | 5 public n-A - d6bcb4f74035 | |||
|
488 | | | | |||
|
489 | o | 4 public b-A - f54f1bb90ff3 | |||
|
490 | | | | |||
|
491 | | o 3 public a-D - b555f63b6063 | |||
|
492 | | | | |||
|
493 | | o 2 public a-C - 54acac6f23ab | |||
|
494 | |/ | |||
|
495 | o 1 public a-B - 548a3d25dbf0 | |||
|
496 | | | |||
|
497 | o 0 public a-A - 054250a37db4 | |||
|
498 | ||||
|
499 | ||||
468 | Pushing to Publish=False (unknown changeset) |
|
500 | Pushing to Publish=False (unknown changeset) | |
469 |
|
501 | |||
470 | $ hg push ../mu -r b740e3e5c05d # a-F |
|
502 | $ hg push ../mu -r b740e3e5c05d # a-F |
General Comments 0
You need to be logged in to leave comments.
Login now