[PATCH] Merge fixes

Martin Pool mbp at sourcefrog.net
Thu Jul 7 09:51:30 BST 2005

On  6 Jul 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:

> I've done some work on the merge code.

Thanks, merged.

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.  The Tree object
should cope if it can't get a stat cache and it should probably be
possible to use remote working trees, but I think merge should probably
default to trying to merge the last revision in the source repository,
not the working copy.

> Leftover temp directories from failed merges are automatically deleted,
> if empty.
> All test cases now were pass.

I linked them in to 'bzr selftest'.


More information about the bazaar mailing list