Show More
@@ -1670,7 +1670,6 b' class localrepository(object):' | |||||
1670 | common, fetch, rheads = tmp |
|
1670 | common, fetch, rheads = tmp | |
1671 | if not fetch: |
|
1671 | if not fetch: | |
1672 | self.ui.status(_("no changes found\n")) |
|
1672 | self.ui.status(_("no changes found\n")) | |
1673 | added = [] |
|
|||
1674 | result = 0 |
|
1673 | result = 0 | |
1675 | else: |
|
1674 | else: | |
1676 | tr = self.transaction(trname) |
|
1675 | tr = self.transaction(trname) | |
@@ -1696,16 +1695,13 b' class localrepository(object):' | |||||
1696 | # be taken in account for phase synchronization. They may |
|
1695 | # be taken in account for phase synchronization. They may | |
1697 | # becomes public and becomes visible again. |
|
1696 | # becomes public and becomes visible again. | |
1698 | cl = self.unfiltered().changelog |
|
1697 | cl = self.unfiltered().changelog | |
1699 | clstart = len(cl) |
|
|||
1700 | result = self.addchangegroup(cg, 'pull', remote.url()) |
|
1698 | result = self.addchangegroup(cg, 'pull', remote.url()) | |
1701 | clend = len(cl) |
|
|||
1702 | added = [cl.node(r) for r in xrange(clstart, clend)] |
|
|||
1703 |
|
1699 | |||
1704 | # compute target subset |
|
1700 | # compute target subset | |
1705 | if heads is None: |
|
1701 | if heads is None: | |
1706 | # We pulled every thing possible |
|
1702 | # We pulled every thing possible | |
1707 | # sync on everything common |
|
1703 | # sync on everything common | |
1708 |
subset = common + |
|
1704 | subset = common + rheads | |
1709 | else: |
|
1705 | else: | |
1710 | # We pulled a specific subset |
|
1706 | # We pulled a specific subset | |
1711 | # sync on this subset |
|
1707 | # sync on this subset |
General Comments 0
You need to be logged in to leave comments.
Login now