changeset 20878 | 09e7118715eb |
parent 20596 | 004a1744088d |
child 20898 | f295b2ac3579 |
--- a/mercurial/exchange.py Thu Mar 20 01:24:45 2014 -0700 +++ b/mercurial/exchange.py Wed Mar 26 15:55:32 2014 -0700 @@ -409,7 +409,12 @@ if self.heads is None: # We pulled every thing possible # sync on everything common - return self.common + self.rheads + c = set(self.common) + ret = list(self.common) + for n in self.rheads: + if n not in c: + ret.append(n) + return ret else: # We pulled a specific subset # sync on this subset