Merge some local changes.

diff --cc checkout.py
index 7d7c7a0f1efe1a2df16ddaccee7e367e35401f96,0482fdacdc7ff72a25186e6f49383ccc6f6bf24c..81c8b66eae8e268f68bddd9655afaf57929932e7
--- 1/checkout.py
--- 2/checkout.py
+++ b/checkout.py
@@@ -108,15 -108,15 +108,15 @@@ class SvnWorkingTree(WorkingTree)
          pass
  
      def get_ignore_list(self):
--        ignores = [svn.wc.get_adm_dir()] + \
--                   svn.wc.get_default_ignores(svn_config)
++        ignores = set([svn.wc.get_adm_dir()])
++        ignores.update(svn.wc.get_default_ignores(svn_config))
  
          def dir_add(wc, prefix):
              ignorestr = svn.wc.prop_get(svn.core.SVN_PROP_IGNORE, 
                                          self.abspath(prefix).rstrip("/"), wc)
              if ignorestr is not None:
                  for pat in ignorestr.splitlines():
--                    ignores.append("./"+os.path.join(prefix, pat))
++                    ignores.add("./"+os.path.join(prefix, pat))
  
              entries = svn.wc.entries_read(wc, False)
              for entry in entries:

diff --cc tests/test_workingtree.py
index d9dfa7d927cfa076e9f8f3f9b25b87bbcc4b4393,9d23c0fe4c8e8295f6ed4309109a40ef6259a54b..f91291d6b92c2db8f4b26ada80c38001843effb2
--- 1/tests/test_workingtree.py
--- 2/tests/test_workingtree.py
+++ b/tests/test_workingtree.py
@@@ -114,13 -116,13 +116,13 @@@ class TestWorkingTree(TestCaseWithSubve
      def test_get_ignore_list_empty(self):
          self.make_client('a', 'dc')
          tree = WorkingTree.open("dc")
--        self.assertEqual([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" "), tree.get_ignore_list())
++        self.assertEqual(set([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" ")), tree.get_ignore_list())
  
      def test_get_ignore_list_onelevel(self):
          self.make_client('a', 'dc')
          self.client_set_prop("dc", "svn:ignore", "*.d\n*.c\n")
          tree = WorkingTree.open("dc")
--        self.assertEqual([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" ") + ["./*.d", "./*.c"], tree.get_ignore_list())
++        self.assertEqual(set([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" ") + ["./*.d", "./*.c"]), tree.get_ignore_list())
  
      def test_get_ignore_list_morelevel(self):
          self.make_client('a', 'dc')
@@@ -129,7 -131,7 +131,7 @@@
          self.client_add("dc/x")
          self.client_set_prop("dc/x", "svn:ignore", "*.e\n")
          tree = WorkingTree.open("dc")
--        self.assertEqual([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" ") + ["./*.d", "./*.c", "./x/*.e"], tree.get_ignore_list())
++        self.assertEqual(set([".svn"] + svn.core.SVN_CONFIG_DEFAULT_GLOBAL_IGNORES.split(" ") + ["./*.d", "./*.c", "./x/*.e"]), tree.get_ignore_list())
  
      def test_add_reopen(self):
          self.make_client('a', 'dc')