Rev 4625: (keep_mine, take_theirs) sounds clearer than (keep_this, keep_other). in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4625
revision-id: v.ladeuil+lp at free.fr-20091017095824-51hxi0o8agj3w5de
parent: v.ladeuil+lp at free.fr-20091016163124-zeitc3cilvvwm9xd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Sat 2009-10-17 11:58:24 +0200
message:
  (keep_mine, take_theirs) sounds clearer than (keep_this, keep_other).
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-10-16 16:31:24 +0000
+++ b/bzrlib/conflicts.py	2009-10-17 09:58:24 +0000
@@ -498,11 +498,11 @@
 
     format = 'Conflict adding file %(conflict_path)s.  %(action)s %(path)s.'
 
-    def keep_this(self, tree):
+    def keep_mine(self, tree):
         tree.remove([self.conflict_path], force=True, keep_files=False)
         tree.rename_one(self.path, self.conflict_path)
 
-    def keep_other(self, tree):
+    def take_theirs(self, tree):
         tree.remove([self.path], force=True, keep_files=False)
 
 

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2009-10-16 16:31:24 +0000
+++ b/bzrlib/tests/test_conflicts.py	2009-10-17 09:58:24 +0000
@@ -273,17 +273,17 @@
 """)
         self.failIfExists('branch/file2.moved')
 
-    def test_resolve_keeping_this(self):
+    def test_resolve_keeping_mine(self):
         self.run_script("""
 $ bzr resolve --interactive file2
-<keep_this
+<keep_mine
 $ bzr commit --strict -m 'No more conflicts nor unknown files'
 """)
 
-    def test_resolve_keeping_other(self):
+    def test_resolve_taking_theirs(self):
         self.run_script("""
 $ bzr resolve --interactive file2
-<keep_other
+<take_theirs
 $ bzr commit --strict -m 'No more conflicts nor unknown files'
 """)