[MERGE REQUEST] hashcache for merge

[Martin Pool]

On  4 Aug 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> panoramicfeedback.com:opensource/bzr.24/ revision 986 adds hashcache
> support to merge.  This means that merges against working directories
> are almost as fast as merges against revisions.  It also fixes a
> longstanding bug that pathname changes without contents changes were
> ignored by merge.
> 
> Revision 987 avoids some unnecessary inventory rewriting, and saves
> about 3 sec when merging kernel trees.

Thanks, merged in.  

I am still getting some assertion failures or IndexErrors when trying to
merge, particularly when merging from a remote branch, but it's getting
to be quite nice.  

I added a patch to handle new_contents_conflict rather than trap.  It
looks like this is meant to happen when a file is created on both sides,
but it seems to fire even if they agree on the contents. 

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050805/abe5f87d/attachment.pgp