[PATCH] Merge fixes

[Aaron Bentley]

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

Martin Pool wrote:
> On  6 Jul 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 
> 
>>I've done some work on the merge code.
> 
> 
> Thanks, merged.

No problem.

> This command:
> 
>   bzr merge http://panoramicfeedback.com/opensource/bzr.merge
> 
> still gives an assertion error in the statcache because it tries to
> merge the remote working directory, which doesn't work....I think merge should probably
> default to trying to merge the last revision in the source repository,
> not the working copy.

Okay, I can hack that up.  What if we swapped the meaning of
"http://panoramicfeedback.com/opensource/bzr.merge" and
"http://panoramicfeedback.com/opensource/bzr.merge/@"?

So http://panoramicfeedback.com/opensource/bzr.merge would mean "latest
revision" and "http://panoramicfeedback.com/opensource/bzr.merge/@"
would mean "working dir".

Or would you rather not cover working-dir merging?

> The Tree object
> should cope if it can't get a stat cache and it should probably be
> possible to use remote working trees

This is a separate issue, right?

> I linked them in to 'bzr selftest'.

Cool.  I noticed in your logs that you had prepared for that, so I made
sure to do it.  Should make it easy to test swapping merge.Diff3 for
something based on merge3.Merge3.

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

iD8DBQFCzW6U0F+nu1YWqI0RAuoqAJ41OBtGjYGnAiREBZsiBGbv/EtefgCdHZZK
thdPiBROvje19dplGEk1R2U=
=Q2MQ
-----END PGP SIGNATURE-----