[MERGE] Re: 'bzr remerge' often report about conflict when it is not

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Alexander Belchenko wrote:
>>> I notice that command 'bzr remerge' often report about conflict in file
>>> when in reality there is no conflicts. When I merge branches I sometimes
>>> find useful to use diff3 merge-type to 'remerge'.
> 
> This is actually a bug with diff3 merging, not remerge.  Here's a patch.
>  (The actual fix in just an indent.  Doh!)
> 
> (I also tweaked the merge test suite so that test case failures don't
> produce extra lock failures.)
> 
> Aaron

+        conflicts = builder.merge(merge_factory)
+        try:
+            self.assertEqual([], conflicts)
+            self.assertEqual(builder.this.get_file("1").read(), "text4" )
+            self.assertEqual(builder.this.get_file("2").read(), "text2" )
+            self.assertEqual(builder.this.get_file("5").read(),
+                             "a\nz\nc\nd\ne\nz\n")
+            self.assertIs(builder.this.is_executable("1"), True)
+            self.assertIs(builder.this.is_executable("2"), False)
+            self.assertIs(builder.this.is_executable("3"), True)
+        except:
+            builder.unlock()
+            raise
         return builder

^- Is there a reason you are using 'assertIs(..., True)'? It seems a lot
better to use "self.assertTrue(builder.this.is_executable("1"))"

Otherwise, +1 from me.

John
=:->


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFJEqeJdeBCYSNAAMRAgfPAKCnJSYfOw8Ccu0sWiGL77hgTxciTQCcDzjb
DJuZJs0pzGnp/qVKdTy/aMs=
=uRit
-----END PGP SIGNATURE-----