[MERGE] #25449

[Aaron Bentley]

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

Roberto Aguilar wrote:
> On Feb 25, 2009, at 8:08 PM, Aaron Bentley wrote:
>> It does not speed up merges.  It slows them down.
> 
> Compare this delay to connecting to a remote branch over ssh or run
> merge on a bzrsvn branch, and 0.8 seconds is instantaneous in
> comparison.

The delay varies with the size of the tree being compared.

> I do not disagree with your assessment.  The patch I submitted can
> definitely be improved, especially if it's incorrect!  After looking at
> the code a little more, I think I've come up with a better solution and
> I hope this is more in the right direction than the last.

I think it would be better to move more of cmd_merge.run into Merger, so
that compare_basis can be invoked before bundle.read_mergeable_from_url.
 Even the revised patch is changing things because it's not doing
Merger.revision_tree, which gives the Merger a chance to cache it.

But that isn't why I'm voting resubmit.  I'm voting resubmit because
this patch breaks the --force option, and because this change has no tests.

$ bzr merge --force ../bzr.dev
bzr: ERROR: Working tree "/home/abentley/bzr/bzr.ab/" has uncommitted
changes.

It also breaks the blackbox test
bzrlib.tests.blackbox.test_merge.TestMerge.test_merge_remember.

Please run the tests when working on code.  If you want to run the tests
specific to merge, you can do: "./bzr selftest [Mm]erge".  Ideally, do
test driven development, but at least make sure your changes are tested.

The problem is here:
@@ -3412,7 +3422,7 @@
                                        merger.other_rev_id)
                     result.report(self.outf)
                     return 0
- -            merger.check_basis(not force)
+            merger.check_basis(force)
             if preview:
                 return self._do_preview(merger)
             else:

By inverting the boolean, you are forcing it to check only when --force
is specified.  You should be specifying False.

bb:resubmit

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmmrWIACgkQ0F+nu1YWqI2fcACfSg6rgl65rAf/CWCjEvorF+L0
CccAn2vY2kdbtJ0fw69390mKAybQR/G8
=EV49
-----END PGP SIGNATURE-----