Show More
@@ -1688,10 +1688,14 b' class localrepository(object):' | |||||
1688 | "changegroupsubset.")) |
|
1688 | "changegroupsubset.")) | |
1689 | else: |
|
1689 | else: | |
1690 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
|
1690 | cg = remote.changegroupsubset(fetch, heads, 'pull') | |
1691 | clstart = len(self.changelog) |
|
1691 | # we use unfiltered changelog here because hidden revision must | |
|
1692 | # be taken in account for phase synchronization. They may | |||
|
1693 | # becomes public and becomes visible again. | |||
|
1694 | cl = self.unfiltered().changelog | |||
|
1695 | clstart = len(cl) | |||
1692 | result = self.addchangegroup(cg, 'pull', remote.url()) |
|
1696 | result = self.addchangegroup(cg, 'pull', remote.url()) | |
1693 |
clend = len( |
|
1697 | clend = len(cl) | |
1694 |
added = [ |
|
1698 | added = [cl.node(r) for r in xrange(clstart, clend)] | |
1695 |
|
1699 | |||
1696 | # compute target subset |
|
1700 | # compute target subset | |
1697 | if heads is None: |
|
1701 | if heads is None: |
@@ -53,3 +53,23 b' Push it. The bundle should not refer to ' | |||||
53 | crosschecking files in changesets and manifests |
|
53 | crosschecking files in changesets and manifests | |
54 | checking files |
|
54 | checking files | |
55 | 2 files, 2 changesets, 2 total revisions |
|
55 | 2 files, 2 changesets, 2 total revisions | |
|
56 | ||||
|
57 | Adding a changeset going extinct locally | |||
|
58 | ------------------------------------------ | |||
|
59 | ||||
|
60 | Pull a changeset that will immediatly goes extinct (because you already have a | |||
|
61 | marker to obsolete him) | |||
|
62 | (test resolution of issue3788) | |||
|
63 | ||||
|
64 | $ hg phase --draft --force f89bcc95eba5 | |||
|
65 | $ hg phase -R ../other --draft --force f89bcc95eba5 | |||
|
66 | $ hg commit --amend -m "A''" | |||
|
67 | $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 | |||
|
68 | $ hg pull ../other | |||
|
69 | pulling from ../other | |||
|
70 | searching for changes | |||
|
71 | adding changesets | |||
|
72 | adding manifests | |||
|
73 | adding file changes | |||
|
74 | added 1 changesets with 0 changes to 1 files (+1 heads) | |||
|
75 | (run 'hg heads' to see heads, 'hg merge' to merge) |
General Comments 0
You need to be logged in to leave comments.
Login now