[merge] another weave merge cleanup

[John A Meinel]

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/

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: cleanup-weave-join.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060212/b88cc5c6/attachment.diff 
-------------- 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/b88cc5c6/attachment.pgp