From a4c75a84abe5a4964669423e0fa5e99fc6d94213 Mon Sep 17 00:00:00 2001
From: Augie Fackler <durin42@gmail.com>
Date: Sun, 26 Oct 2008 22:12:46 -0500
Subject: [PATCH] Add a test that proves files in the branches directory don't
 cause breakage.

---
 .../fixtures/file_mixed_with_branches.svndump | 119 ++++++++++++++++++
 tests/test_fetch_command.py                   |   6 +
 2 files changed, 125 insertions(+)
 create mode 100644 tests/fixtures/file_mixed_with_branches.svndump

diff --git a/tests/fixtures/file_mixed_with_branches.svndump b/tests/fixtures/file_mixed_with_branches.svndump
new file mode 100644
index 0000000000..9e2cdbd3ba
--- /dev/null
+++ b/tests/fixtures/file_mixed_with_branches.svndump
@@ -0,0 +1,119 @@
+SVN-fs-dump-format-version: 2
+
+UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2008-10-07T22:49:12.059692Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 111
+Content-length: 111
+
+K 7
+svn:log
+V 11
+Empty dirs.
+K 10
+svn:author
+V 5
+durin
+K 8
+svn:date
+V 27
+2008-10-07T22:49:41.118037Z
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+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: 108
+Content-length: 108
+
+K 7
+svn:log
+V 9
+Add alpha
+K 10
+svn:author
+V 5
+durin
+K 8
+svn:date
+V 27
+2008-10-07T23:23:02.991743Z
+PROPS-END
+
+Node-path: trunk/alpha
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 12
+Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17
+Content-length: 22
+
+PROPS-END
+file: alpha
+
+
+Revision-number: 3
+Prop-content-length: 129
+Content-length: 129
+
+K 7
+svn:log
+V 29
+Adding a readme for branches.
+K 10
+svn:author
+V 5
+durin
+K 8
+svn:date
+V 27
+2008-10-27T03:08:00.088667Z
+PROPS-END
+
+Node-path: branches/README
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 40
+Text-content-md5: 05e0cee6729d14caf6688d01b4bbfa0d
+Content-length: 50
+
+PROPS-END
+This is a readme on how to use branches
+
+
diff --git a/tests/test_fetch_command.py b/tests/test_fetch_command.py
index f11725eb18..dd3acce86b 100644
--- a/tests/test_fetch_command.py
+++ b/tests/test_fetch_command.py
@@ -91,6 +91,12 @@ class TestBasicRepoLayout(unittest.TestCase):
         self.assertEqual(repo['tip'], repo['default'])
         self.assertEqual(len(repo.heads()), 2)
 
+    def test_file_mixed_with_branches(self):
+        repo = self._load_fixture_and_fetch('file_mixed_with_branches.svndump')
+        self.assertEqual(node.hex(repo['tip'].node()),
+                         'a47d0ce778660a91c31bf2c21c448e9ee296ac90')
+        assert 'README' not in repo
+
 
 class TestStupidPull(unittest.TestCase):
     def setUp(self):