Bazaar

lp:~jameinel/bzr/merge3-per-file

Created by John A Meinel and last modified
This branch may be out of date, because Launchpad has not been able to access it since .
Get this branch:
bzr branch lp:~jameinel/bzr/merge3-per-file

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
John A Meinel
Project:
Bazaar
Status:
Experimental
Location:
http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file
Last mirrored:
Next mirror:
Disabled

Updating branch...

Launchpad is processing new changes to this branch which will be available in a few minutes. Reload to see the changes.

Recent revisions

3525. By John A Meinel

Update the lca_multi_way logic so that it can handle when bases supersede eachother for a given entry.

3524. By John A Meinel

We don't even have has_version

3523. By John A Meinel

get the name right

3522. By John A Meinel

We need to add in the NULL_REVISION if we have to use it as a base.

3521. By John A Meinel

Fall back to more complete ancestry when we encounter an edge case that doesn't work with simple LCA searching.

3520. By John A Meinel

Handle when the graphs don't actually combine.

3519. By John A Meinel

Seeing if we can get the merge right without having to have all nodes.

3518. By John A Meinel

Hack in a Weave merger that includes all possibly relevant texts.

It seems it fixes this problem, so we may need to re-think how we are doing the partial merges.

3517. By John A Meinel

Switch from note() to mutter() so we can still get the info from the log, but we don't clutter the screen as much.

3516. By John A Meinel

Revert back, and just assume that None means not present.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers