[ANNOUNCE] bzrtools-54 [PATCH] allow tracking a baz project

John A Meinel john at arbash-meinel.com
Fri Jun 3 16:02:56 BST 2005


Aaron Bentley wrote:

> John A Meinel wrote:
> | Or you could copy .bzr to a temp directory, and then do a checkout of
> | the latest revision, and just patch up from there. That would be okay.
> | And if that is what you mean by "every" then I think its fine.
>
> Yeah, that's what I meant by "every".  I recognize that may not be the
> conventional meaning :-)
>
> Actually, I meant every revision in the truncated ancestry list.
>
> Oh, and I forgot to mention in the last email that I've applied your
> patch.
>
> Aaron

Thanks for applying the patch. For your request about re-creating the
{arch} directories, and then doing a merge, I went ahead and did what I
think is the correct thing.

There is a potential optimization where you actually rename the .bzr
directory to the temp directory rather than doing a copytree, the reason
I went with copytree is that you can leave the original output directory
alone if there are any exceptions. (I'm not sure what type of bugs might
be in this/in the final merge).
I don't know that the extra security is worth the copy time, since if
the .bzr is created successfully, you only need to remove a couple of
entries from "./bzr/revision_history" and things should work again.
(Especially if you then issue a bzr revert command).

But, regardless, attached is the patch that does pretty much what you
recommended.

And finally, it would be possible to actually do slightly diverged trees
with this method. You just have to find the latest Arch-x: revision and
merge from there. However, I don't think we want to tell people that it
is okay to develop in the same directory that they are keeping in sync
with another tree.

Also, sorry about some whitespace fixes, I accidentally had some tabs in
the old code.
I tested on the same tree, and things seemed to work.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: baz2bzr-uses-merge.patch
Type: text/x-patch
Size: 3823 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050603/65f30763/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050603/65f30763/attachment.pgp 


More information about the bazaar mailing list