Rev 4617: Some failing tests. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4617
revision-id: v.ladeuil+lp at free.fr-20091016125442-hq73l9xr2v9io27i
parent: v.ladeuil+lp at free.fr-20091015073740-py27leyd578a7qbe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Fri 2009-10-16 14:54:42 +0200
message:
  Some failing tests.
  
  * bzrlib/tests/test_conflicts.py:
  (TestResolveDuplicatePaths.test_resolve_keeping_this): Add
  explicit failing tests for resolve --interactive.
  
  * Outline.txt:
  Link more bugs.
-------------- next part --------------
=== modified file 'Outline.txt'
--- a/Outline.txt	2009-09-16 13:38:07 +0000
+++ b/Outline.txt	2009-10-16 12:54:42 +0000
@@ -10,6 +10,9 @@
 https://bugs.edge.launchpad.net/bzr/+bug/416903
 https://bugs.edge.launchpad.net/bzr/+bug/355964
 
+https://bugs.edge.launchpad.net/bzr/+bug/257297
+https://bugs.edge.launchpad.net/bzr/+bug/232512
+
 https://bugs.edge.launchpad.net/bzr/+bug/405264
 
 

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2009-09-17 19:41:49 +0000
+++ b/bzrlib/tests/test_conflicts.py	2009-10-16 12:54:42 +0000
@@ -272,6 +272,20 @@
 """)
         self.failIfExists('branch/file2.moved')
 
+    def test_resolve_keeping_this(self):
+        self.run_script("""
+$ bzr resolve --interactive file
+<this
+$ bzr commit --strict -m 'No more conflicts nor unknown files'
+""")
+
+    def test_resolve_keeping_other(self):
+        self.run_script("""
+$ bzr resolve --interactive file
+<other
+$ bzr commit --strict -m 'No more conflicts nor unknown files'
+""")
+
 
 class TestResolveUnversionedParent(TestResolveConflicts):
 

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-10-15 07:37:36 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-10-16 12:54:42 +0000
@@ -28,7 +28,6 @@
 from bzrlib import (
     branchbuilder,
     bzrdir,
-    config,
     debug,
     errors,
     lockdir,