Show More
@@ -1520,6 +1520,7 b' class localrepository(repo.repository):' | |||||
1520 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
|
1520 | cg = remote.changegroupsubset(fetch, heads, 'pull') | |
1521 | result = self.addchangegroup(cg, 'pull', remote.url(), |
|
1521 | result = self.addchangegroup(cg, 'pull', remote.url(), | |
1522 | lock=lock) |
|
1522 | lock=lock) | |
|
1523 | phases.advanceboundary(self, 0, common) | |||
1523 | finally: |
|
1524 | finally: | |
1524 | lock.release() |
|
1525 | lock.release() | |
1525 |
|
1526 |
@@ -80,3 +80,33 b' push from alpha to beta should update ph' | |||||
80 | 1 0 a-B |
|
80 | 1 0 a-B | |
81 | 0 0 a-A |
|
81 | 0 0 a-A | |
82 |
|
82 | |||
|
83 | update must update phase of common changeset too | |||
|
84 | ||||
|
85 | $ hg pull ../beta # getting b-A | |||
|
86 | pulling from ../beta | |||
|
87 | searching for changes | |||
|
88 | adding changesets | |||
|
89 | adding manifests | |||
|
90 | adding file changes | |||
|
91 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
92 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
93 | ||||
|
94 | $ cd ../beta | |||
|
95 | $ hgph # not updated by remote pull | |||
|
96 | 4 0 a-D | |||
|
97 | 3 0 a-C | |||
|
98 | 2 1 b-A | |||
|
99 | 1 0 a-B | |||
|
100 | 0 0 a-A | |||
|
101 | $ hg pull ../alpha | |||
|
102 | pulling from ../alpha | |||
|
103 | searching for changes | |||
|
104 | no changes found | |||
|
105 | $ hgph | |||
|
106 | 4 0 a-D | |||
|
107 | 3 0 a-C | |||
|
108 | 2 0 b-A | |||
|
109 | 1 0 a-B | |||
|
110 | 0 0 a-A | |||
|
111 | ||||
|
112 |
General Comments 0
You need to be logged in to leave comments.
Login now