Show More
@@ -1899,7 +1899,8 b' class localrepository(object):' | |||||
1899 | # We can pick: |
|
1899 | # We can pick: | |
1900 | # * missingheads part of common (::commonheads) |
|
1900 | # * missingheads part of common (::commonheads) | |
1901 | common = set(outgoing.common) |
|
1901 | common = set(outgoing.common) | |
1902 | cheads = [node for node in revs if node in common] |
|
1902 | nm = self.changelog.nodemap | |
|
1903 | cheads = [node for node in revs if nm[node] in common] | |||
1903 | # and |
|
1904 | # and | |
1904 | # * commonheads parents on missing |
|
1905 | # * commonheads parents on missing | |
1905 | revset = unfi.set('%ln and parents(roots(%ln))', |
|
1906 | revset = unfi.set('%ln and parents(roots(%ln))', |
@@ -92,6 +92,20 b' push from alpha to beta should update ph' | |||||
92 | | |
|
92 | | | |
93 | o 0 public a-A - 054250a37db4 |
|
93 | o 0 public a-A - 054250a37db4 | |
94 |
|
94 | |||
|
95 | $ hg push -r 2 ../beta | |||
|
96 | pushing to ../beta | |||
|
97 | searching for changes | |||
|
98 | no changes found | |||
|
99 | [1] | |||
|
100 | $ hgph | |||
|
101 | @ 3 draft a-D - b555f63b6063 | |||
|
102 | | | |||
|
103 | o 2 public a-C - 54acac6f23ab | |||
|
104 | | | |||
|
105 | o 1 public a-B - 548a3d25dbf0 | |||
|
106 | | | |||
|
107 | o 0 public a-A - 054250a37db4 | |||
|
108 | ||||
95 | $ hg push ../beta |
|
109 | $ hg push ../beta | |
96 | pushing to ../beta |
|
110 | pushing to ../beta | |
97 | searching for changes |
|
111 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now