# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1299704846 -3600
# Node ID ba65c0b01d4f253eca486b3864d7f8af1ae4e64c
# Parent  05ee7d5351decd1f0c23f279493320f80f0ce89f
replay: copy copied directories externals

diff --git a/hgsubversion/editor.py b/hgsubversion/editor.py
--- a/hgsubversion/editor.py
+++ b/hgsubversion/editor.py
@@ -8,6 +8,7 @@ from mercurial import node
 
 import svnwrap
 import util
+import svnexternals
 
 class RevisionData(object):
 
@@ -268,6 +269,13 @@ class HgEditor(svnwrap.Editor):
                 for k, v in copies.iteritems():
                     if util.issamefile(parentctx, fromctx, v):
                         self.current.copies[k] = v
+        # Copy the externals definitions of copied directories
+        fromext = svnexternals.parse(self.ui, fromctx)
+        for p, v in fromext.iteritems():
+            pp = p and (p + '/') or ''
+            if pp.startswith(frompath):
+                dest = (path + '/' + pp[len(frompath):]).rstrip('/')
+                self.current.externals[dest] = v
         return path
 
     @svnwrap.ieditor
diff --git a/tests/fixtures/mergeexternals.sh b/tests/fixtures/mergeexternals.sh
new file mode 100644
--- /dev/null
+++ b/tests/fixtures/mergeexternals.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Generate mergeexternals.svndump
+#
+
+mkdir temp
+cd temp
+
+mkdir project-orig
+cd project-orig
+mkdir trunk
+mkdir branches
+cd ..
+
+svnadmin create testrepo
+svnurl=file://`pwd`/testrepo
+svn import project-orig $svnurl -m "init project"
+
+svn co $svnurl project
+cd project/trunk
+mkdir d1
+echo a > d1/a
+mkdir d2
+echo b > d2/b
+mkdir -p common/ext
+echo c > common/ext/c
+svn add d1 d2 common
+svn ci -m addfiles
+svn up
+svn propset svn:externals '^/trunk/common/ext ext' d1
+svn propset svn:externals '^/trunk/common/ext ext' d2
+svn ci -m addexternals
+cd ..
+svn up
+svn cp trunk branches/branch
+cd branches
+svn ci -m addbranch
+cd branch
+mkdir d3
+echo d > d3/d
+svn add d3
+svn propset svn:externals '^/trunk/common/ext ext3' d3
+svn ci -m touchbranch
+cd ../../trunk
+svn merge '^/branches/branch'
+svn up
+svn ci -m 'merge'
+cd ../..
+
+svnadmin dump testrepo > ../mergeexternals.svndump
diff --git a/tests/fixtures/mergeexternals.svndump b/tests/fixtures/mergeexternals.svndump
new file mode 100644
--- /dev/null
+++ b/tests/fixtures/mergeexternals.svndump
@@ -0,0 +1,306 @@
+SVN-fs-dump-format-version: 2
+
+UUID: b402ceb9-6185-4dce-93a1-92de515c5c8b
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2011-02-25T13:54:38.654361Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 114
+Content-length: 114
+
+K 7
+svn:log
+V 12
+init project
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:38.675100Z
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 109
+Content-length: 109
+
+K 7
+svn:log
+V 8
+addfiles
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:39.078800Z
+PROPS-END
+
+Node-path: trunk/common
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/common/ext
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/common/ext/c
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
+Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
+Content-length: 12
+
+PROPS-END
+c
+
+
+Node-path: trunk/d1
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/d1/a
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
+Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
+Content-length: 12
+
+PROPS-END
+a
+
+
+Node-path: trunk/d2
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/d2/b
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 3b5d5c3712955042212316173ccf37be
+Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
+Content-length: 12
+
+PROPS-END
+b
+
+
+Revision-number: 3
+Prop-content-length: 114
+Content-length: 114
+
+K 7
+svn:log
+V 12
+addexternals
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:41.071346Z
+PROPS-END
+
+Node-path: trunk/d1
+Node-kind: dir
+Node-action: change
+Prop-content-length: 58
+Content-length: 58
+
+K 13
+svn:externals
+V 23
+^/trunk/common/ext ext
+
+PROPS-END
+
+
+Node-path: trunk/d2
+Node-kind: dir
+Node-action: change
+Prop-content-length: 58
+Content-length: 58
+
+K 13
+svn:externals
+V 23
+^/trunk/common/ext ext
+
+PROPS-END
+
+
+Revision-number: 4
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+addbranch
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:44.043149Z
+PROPS-END
+
+Node-path: branches/branch
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 3
+Node-copyfrom-path: trunk
+
+
+Revision-number: 5
+Prop-content-length: 113
+Content-length: 113
+
+K 7
+svn:log
+V 11
+touchbranch
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:45.080319Z
+PROPS-END
+
+Node-path: branches/branch/d3
+Node-kind: dir
+Node-action: add
+Prop-content-length: 59
+Content-length: 59
+
+K 13
+svn:externals
+V 24
+^/trunk/common/ext ext3
+
+PROPS-END
+
+
+Node-path: branches/branch/d3/d
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b
+Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff
+Content-length: 12
+
+PROPS-END
+d
+
+
+Revision-number: 6
+Prop-content-length: 106
+Content-length: 106
+
+K 7
+svn:log
+V 5
+merge
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2011-02-25T13:54:48.049151Z
+PROPS-END
+
+Node-path: trunk
+Node-kind: dir
+Node-action: change
+Prop-content-length: 55
+Content-length: 55
+
+K 13
+svn:mergeinfo
+V 20
+/branches/branch:4-5
+PROPS-END
+
+
+Node-path: trunk/d3
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 5
+Node-copyfrom-path: branches/branch/d3
+Prop-content-length: 59
+Content-length: 59
+
+K 13
+svn:externals
+V 24
+^/trunk/common/ext ext3
+
+PROPS-END
+
+
diff --git a/tests/test_externals.py b/tests/test_externals.py
--- a/tests/test_externals.py
+++ b/tests/test_externals.py
@@ -258,6 +258,20 @@ 2 deps/project2
         repo.wwrite('subdir/deps/project1/a', 'foobar', '')
         commands.update(ui, repo, node='4', clean=True)
 
+    def test_mergeexternals(self, stupid=False):
+        repo = self._load_fixture_and_fetch('mergeexternals.svndump',
+                                            externals='subrepos',
+                                            stupid=stupid)
+        # Check merged directories externals are fine
+        self.assertEqual("""\
+d1/ext = [hgsubversion] d1:^/trunk/common/ext ext
+d2/ext = [hgsubversion] d2:^/trunk/common/ext ext
+d3/ext3 = [hgsubversion] d3:^/trunk/common/ext ext3
+""", repo['tip']['.hgsub'].data())
+
+    def test_mergeexternals_stupid(self):
+        self.test_mergeexternals(True)
+
 class TestPushExternals(test_util.TestBase):
     def test_push_externals(self, stupid=False):
         test_util.load_fixture_and_fetch('pushexternals.svndump',