bzr 0.7 release candidate 2

[John Arbash Meinel]

Marien Zwart wrote:
> On Wed, Jan 18, 2006 at 05:13:06PM -0600, John Arbash Meinel wrote:
> 

...

>>
>>Robey's patches are pending in his branch. I don't know if they will
>>make 0.7 or not. His changes haven't been double reviewed yet. But see
>>'outstanding patches at bzr.robey' for the patches.
>>
>>John
>>=:->
>>
> 
> A patch for log and status is in bzr.robey (r1521) waiting for a
> second +1. A patch for a similar problem with diff is in
> bzr-jam-integration (r1501). I hope both will be merged before 0.7.
> 

jam-integration hasn't been merged into bzr.dev since revno=1496.

Which means bzr.dev is missing:

 1496 John Arbash Meinel        2006-01-04
      [patch] Wouter Bolsterlee: Fix ftp error in error handling code

 1497 John Arbash Meinel        2006-01-08
      [merge] jam-pending 1502: remove ancestry.weave, remove --all from
uncommit.

 1498 John Arbash Meinel        2006-01-08
      [merge] bzr.dev 1515

 1499 John Arbash Meinel        2006-01-10
      [merge] Denys Duchier bzr.patches: remove apply_changeset and
get_inventory_tree

 1500 John Arbash Meinel        2006-01-10
      uncommit doesn't need to read inventories since it doesn't do cleanup.

 1501 John Arbash Meinel        2006-01-10
      [patch] Robey Pointer: diff -r 1.. should diff against working tree.

 1502 John Arbash Meinel        2006-01-11
      [merge] Denys Duchier bzr.cleanup revno 1500: a few small code
cleanups

 1503 John Arbash Meinel        2006-01-12
      [merge] Robert Collins integration.

 1504 John Arbash Meinel        2006-01-16
      [merge] jam-pending: bzr.dev + give correct error message when not
in working tree.

 1505 John Arbash Meinel        2006-01-17
      [merge] Denys Duchier: fix revisionspec to allow branch:../otherbranch

The diff against bzr.dev isn't very big, but that is because Martin has
merged Robert's integration changes in bzr.dev but didn't for
bzr-0.7rc2. Which has all of the 'TestTransportImplementation' stuff.
Which is some pretty major changes.

I think Martin could merge jam-integration up to 1502, which is all
minor cleanups, and then if he cherry-picked 1504 and 1505 he would have
a good set of cleanup patches.
It is just 1503 that he needs to avoid.

Oh, he might need to avoid 1504 as well, since it contains stuff that he
merged *after* branching off for 0.7rc1. (such as the bump to 0.8pre).

So Martin... What about merging up to 1502? That is all just
cleanup/bugfixes, no major code changes. And then 1503+ can wait until 0.8.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060118/df6e9288/attachment.pgp