[merge] another weave merge cleanup
Robert Collins
robertc at robertcollins.net
Sun Feb 12 20:42:23 GMT 2006
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
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060213/e63b5c86/attachment.pgp
More information about the bazaar
mailing list