Index: mergebot/trunk/utils/test.py
===================================================================
--- mergebot/trunk/utils/test.py	(revision 57)
+++ mergebot/trunk/utils/test.py	(revision 58)
@@ -389,6 +389,34 @@
         self.switch(ticket_id)
         self.mv(basename, basename + '-renamed')
-        self.commit('Rename the file on branch')
-
+        self.commit('Rename the file on the branch')
+
+        self._tester.rebranch_conflict(ticket_id, 'stuff')
+
+
+class MergeBotTestRebranchWithTrunkRenameConflict(FunctionalSvnTestCaseSetup):
+    def runTest(self):
+        """Verify that the 'rebranch' button works when a file renamed on trunk was modified on the branch"""
+        ticket_id = self._tester.create_ticket(summary=self.__class__.__name__,
+            info={'component':'stuff', 'version':'trunk'})
+        basename = self.__class__.__name__
+
+        # create a file in which to have conflicts
+        self.checkout()
+        self.add_new_file(basename)
+        self.commit('Add a new file on trunk')
+
+        # create the branch
+        self._tester.branch(ticket_id, 'stuff')
+
+        # rename the file on trunk
+        self.mv(basename, basename + '-renamed')
+        self.commit('Rename the file on trunk')
+
+        # rename the file on the branch
+        self.switch(ticket_id)
+        open(os.path.join(self.get_workdir(), basename), 'a').write(random_sentence())
+        self.commit('Modify the file on the branch')
+
+        # make sure it finds the conflict
         self._tester.rebranch_conflict(ticket_id, 'stuff')
 
@@ -436,4 +464,5 @@
     suite.addTest(MergeBotTestRebranchWithConflict())
     suite.addTest(MergeBotTestRebranchWithBranchRenameConflict())
+    suite.addTest(MergeBotTestRebranchWithTrunkRenameConflict())
     suite.addTest(MergeBotTestSingleUseCase())
     return suite