Rev 1716: Merge bzr-foreign fix. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1716
revision-id: jelmer at samba.org-20080830023218-9sjax4qe4bwtefqk
parent: jelmer at samba.org-20080830023127-fp1v5w9u5a0e9pb3
parent: jelmer at samba.org-20080830023110-397hpvc2rlqnf2ih
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-08-30 04:32:18 +0200
message:
  Merge bzr-foreign fix.
modified:
  foreign/__init__.py            foreign.py-20080827193306-rxeku2c2obec90c4-1
    ------------------------------------------------------------
    revno: 0.5.11
    revision-id: jelmer at samba.org-20080830023110-397hpvc2rlqnf2ih
    parent: jelmer at samba.org-20080829161758-b43sblgbhz056cgs
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-08-30 04:31:10 +0200
    message:
      Fix dpush.
    modified:
      __init__.py                    foreign.py-20080827193306-rxeku2c2obec90c4-1
=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py	2008-08-29 16:20:10 +0000
+++ b/foreign/__init__.py	2008-08-30 02:32:18 +0000
@@ -132,7 +132,7 @@
         bzrdir = BzrDir.open(location)
         target_branch = bzrdir.open_branch()
         target_branch.lock_write()
-        revid_map = source_branch.dpull(target_branch)
+        revid_map = target_branch.dpull(source_branch)
         # We successfully created the target, remember it
         if source_branch.get_push_location() is None or remember:
             source_branch.set_push_location(target_branch.base)