Loom

Merge lp://staging/~spiv/bzr-loom/bzr-2.4-compat into lp://staging/bzr-loom

bzr-2.4-compat
Merge into trunk

Proposed by Andrew Bennetts on 2011-03-01

Status:

Merged

Approved by:

John A Meinel on 2011-03-01

Approved revision:

130

Merged at revision:

131

Proposed branch:

lp://staging/~spiv/bzr-loom/bzr-2.4-compat

Merge into:

lp://staging/bzr-loom

Diff against target:

153 lines (+44/-17)

1 file modified

branch.py (+44/-17)

To merge this branch:

bzr merge lp://staging/~spiv/bzr-loom/bzr-2.4-compat

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
John A Meinel		2011-03-01	Approve on 2011-03-01
Review via email: mp+51714@code.staging.launchpad.net

Description of the change

This branch depends on <https://code.launchpad.net/~spiv/bzr/branch-revs-to-fetch/+merge/51710>.

This fixes all the test failures in bzr-loom when run with lp:bzr.

Some points of interest, and maybe concern:

* it now does a single fetch, rather than one fetch per thread. Yay!
* for simplicity I haven't tried to maintain backwards compatibility with bzr 2.3. Should I?
* I also implemented pushing/pulling etc of tags for looms. The model is simple: there's a global tags dict for the whole loom, independent of threads. That is, tag semantics are basically unaffected by 'bzr loomify'. This is part of this patch because it was the easiest path to getting tests passing; previously looms sort-of had tags, and the new tests in lp:bzr were partly failing because of that.

Revision history for this message

Robert Collins (lifeless) wrote on 2011-03-01:

Revision history for this message

John A Meinel (jameinel) wrote on 2011-03-01:

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

On 3/1/2011 9:39 AM, Andrew Bennetts wrote:
> Andrew Bennetts has proposed merging lp:~spiv/bzr-loom/bzr-2.4-compat into lp:bzr-loom.
>
> Requested reviews:
> Loom Developers (bzr-loom-devs)
> Related bugs:
> #721328 revno 5648 on bzr.dev broke loom tests
> https://bugs.launchpad.net/bugs/721328
>
> For more details, see:
> https://code.launchpad.net/~spiv/bzr-loom/bzr-2.4-compat/+merge/51714
>
> This branch depends on <https://code.launchpad.net/~spiv/bzr/branch-revs-to-fetch/+merge/51710>.
>
> This fixes all the test failures in bzr-loom when run with lp:bzr.
>
> Some points of interest, and maybe concern:
>
> * it now does a single fetch, rather than one fetch per thread. Yay!
> * for simplicity I haven't tried to maintain backwards compatibility with bzr 2.3. Should I?
> * I also implemented pushing/pulling etc of tags for looms. The model is simple: there's a global tags dict for the whole loom, independent of threads. That is, tag semantics are basically unaffected by 'bzr loomify'. This is part of this patch because it was the easiest path to getting tests passing; previously looms sort-of had tags, and the new tests in lp:bzr were partly failing because of that.