lp:~jameinel/bzr/lazy_revno

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/lazy_revno

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
John A Meinel
Project:
Bazaar
Status:
Development
Location:
http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno
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

3530. By John A Meinel

Expose get_lazy_revno_mapper() as part of Branch.

3529. By John A Meinel

Revert the is_ghost workaround, because it was incorrect anyway.

3528. By John A Meinel

Merge bzr.dev 3948

3527. By John A Meinel

Merge bzr.dev 3616, including fixes for merge_sort

3526. By John A Meinel

Reproduce bzr.dev's numbering logic by filtering ghosts. (breaks tests)

3525. By John A Meinel

Turn ghosts into just another shortcut to NULL_REVISION

3524. By John A Meinel

Injecting a 'dummy' revision fixes both problems, not sure if it is 100% correct

3523. By John A Meinel

We need one more bit to test the other part.
If we remove only parents that are not in the ancestry, it causes
the staging branch to appear to be descended from the feature branch
(its left-hand parent is removed, so the feature becomes the parent)
This only shows up when numbering another child, which should be
preserved on the same 'branch'.

3522. By John A Meinel

Add a test which shows a failing numbering.
Basically, with a staging branch, its base is old enough that we
filter it out when numbering.
We can't just remove the left-hand parent, because that would make it look
like we *descended* from the feature branch (and give wrong numberings)
But if we filter out *all* parents, then it looks like the feature was not merged.

3521. By John A Meinel

Change _propagate_descended_from to do what I thought I was doing :)
I thought I was doing a depth-first, but it turned out I was just stepping breadth-wise.
Doesn't change the problems, but should be a small improvement to prevent re-walking
the same nodes repeatedly.

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