Index: /mergebot/trunk/mergebot/svn.py
===================================================================
--- /mergebot/trunk/mergebot/svn.py	(revision 61)
+++ /mergebot/trunk/mergebot/svn.py	(revision 62)
@@ -157,4 +157,6 @@
             elif line.startswith('  Tree conflicts:'):
                 continue # ignore the line
+            elif line.startswith('  Property conflicts:'):
+                continue # ignore the line
             else:
                 assert len(line) > 4 and line[4] == ' ', "Unexpected output " \
Index: /mergebot/trunk/utils/test.py
===================================================================
--- /mergebot/trunk/utils/test.py	(revision 61)
+++ /mergebot/trunk/utils/test.py	(revision 62)
@@ -250,4 +250,11 @@
         self.assertEqual(retval, 0, "svn mv failed with error %s" % (retval))
 
+    def propset(self, propname, propvalue, filename):
+        retval = call(['svn', 'propset', propname, propvalue, filename],
+            cwd=self.get_workdir(),
+            stdout=logfile, stderr=logfile)
+        self.assertEqual(retval, 0, "svn prposet failed with error %s" % (retval))
+        
+
 
 class MergeBotTestEnabled(FunctionalTwillTestCaseSetup):
@@ -363,4 +370,31 @@
 
 
+class MergeBotTestMergeWithPropertyConflict(FunctionalSvnTestCaseSetup):
+    def runTest(self):
+        """Verify that the 'merge' button detects property conflicts between the branch and trunk"""
+        ticket_id = self._tester.create_ticket(summary=self.__class__.__name__,
+            info={'component':'stuff', 'version':'trunk'})
+        basename = self.__class__.__name__
+
+        self.checkout()
+        self.propset('svn:ignore', basename, '.')
+        self.commit('set property on trunk')
+
+        # create the branch
+        self._tester.branch(ticket_id, 'stuff')
+
+        # modify the property on trunk
+        self.propset('svn:ignore', basename + '\ntrunk', '.')
+        self.commit('Modify the property on trunk')
+
+        # modify the property on the branch
+        self.switch(ticket_id)
+        self.propset('svn:ignore', basename + '\nbranch', '.')
+        self.commit('Modify the property on branch')
+
+        # merge, make sure it shows a conflict
+        self._tester.merge_conflict(ticket_id, 'stuff')
+
+
 class MergeBotTestMergeWithBranchRenameConflict(FunctionalSvnTestCaseSetup):
     def runTest(self):
@@ -486,4 +520,31 @@
         open(os.path.join(self.get_workdir(), basename), 'a').write(random_sentence())
         self.commit('Modify the file on branch')
+
+        # rebranch, make sure it shows a conflict
+        self._tester.rebranch_conflict(ticket_id, 'stuff')
+
+
+class MergeBotTestRebranchWithPropertyConflict(FunctionalSvnTestCaseSetup):
+    def runTest(self):
+        """Verify that the 'rebranch' button detects property conflicts between the branch and trunk"""
+        ticket_id = self._tester.create_ticket(summary=self.__class__.__name__,
+            info={'component':'stuff', 'version':'trunk'})
+        basename = self.__class__.__name__
+
+        self.checkout()
+        self.propset('svn:ignore', basename, '.')
+        self.commit('set property on trunk')
+
+        # create the branch
+        self._tester.branch(ticket_id, 'stuff')
+
+        # modify the property on trunk
+        self.propset('svn:ignore', basename + '\ntrunk', '.')
+        self.commit('Modify the property on trunk')
+
+        # modify the property on the branch
+        self.switch(ticket_id)
+        self.propset('svn:ignore', basename + '\nbranch', '.')
+        self.commit('Modify the property on branch')
 
         # rebranch, make sure it shows a conflict
@@ -587,4 +648,5 @@
     suite.addTest(MergeBotTestRebranchWithChangeAndTrunkChange())
     suite.addTest(MergeBotTestRebranchWithConflict())
+    suite.addTest(MergeBotTestRebranchWithPropertyConflict())
     suite.addTest(MergeBotTestRebranchWithBranchRenameConflict())
     suite.addTest(MergeBotTestRebranchWithTrunkRenameConflict())
@@ -592,4 +654,5 @@
     suite.addTest(MergeBotTestMergeWithChangeAndTrunkChange())
     suite.addTest(MergeBotTestMergeWithConflict())
+    suite.addTest(MergeBotTestMergeWithPropertyConflict())
     suite.addTest(MergeBotTestMergeWithBranchRenameConflict())
     suite.addTest(MergeBotTestMergeWithTrunkRenameConflict())