[merge] another weave merge cleanup

[John Arbash Meinel]

Robert Collins wrote:
> On Sun, 2006-02-12 at 13:41 -0600, John A Meinel wrote:
>> I did a couple small fixes to the weave merging code. Right now the
>> merge code says "merge weave merge" which doesn't mean much, so I
>> changed it to "merge weaves".
>> And secondly, my original patch caused you to see "merging 3200/3500",
>> now I updated it, so that the total count is the number of revisions we
>> are merging, not the total number of revisions present.
>>
>> Attached is the patch, the changes are present in:
>> http://bzr.arbash-meinel.com/branches/bzr/fix-weave-join/
> 
> +1
> 
> Rob

Thanks, merged into jam-integration revno 1530.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060212/a8153f02/attachment.pgp