tla ancestry with bzr ?
John Arbash Meinel
john at arbash-meinel.com
Tue Nov 29 16:06:30 GMT 2005
Belmar-Letelier wrote:
> Aaron Bentley a écrit :
>
>>Belmar-Letelier wrote:
>>
>>
>>>>What is tha bzr way to do the following with tla ?
>>
>>
>>In tla, there's a mandatory namespace, and branches have strong
>>identities. Bzr doesn't need that. Branches are referred to by their
>>location, and branch nicks, and branch names, are merely hints. When
>>you create a branch of another branch in bzr, the numbers don't restart.
>> So if there were a "bzr ancestry", you'd always get something like:
>>
>>$bzr ancestry
>>bzr.dev
>>1447 .. 1
>>
>>You'd never get something like this:
>>$bzr ancestry
>>bzr.ab
>>45 .. 1
>>bzr.dev
>>1447 .. 1
>>
>>In bzr, the log command serves much the same purpose. There's also the
>>bzrk plugin, which draws pretty pictures of a branch's ancestry.
>>
>>
>>
>>>>$ cd my_proj--main--0.1
>>>>$ tla tree-version
>
>
> Here is my use case in tla
>
> $ tla tag -S friend at i.com--public/proj--main--0.1 proj--luis--0.1
> $ tla get proj--luis--0.1 proj--luis--0.1
> $ cd proj--luis--0.1
> ... work on it, commit ...
>
> some time later I came back on
> $ cd proj--luis--0.1
>
> I do not remenber from who this branch came from so I use
>
> $ tla ancestry
> I found : friend at i.com--public/proj--main--0.1
>
> So I can check what's new
> $ tla missing -sD friend at i.com--public/proj--main--0.1
>
> I can read the missing logs summary
> An then I can star-merge and commit ...
>
>
> How to realise this usecase with bzr today ?
In general, you usually have a parent of a branch. That was the one that
you first branched/pulled/merged/etc from.
It is stored in .bzr/parent
I don't think we ever created a command to show this to the user, though
we probably should.
But it is the default for all pull/merge/etc commands. So if you do:
bzr branch http://other local
cd local
<hack hack commit hack hack etc>
bzr merge # This will default to http://other
Does that help you?
John
=:->
>
>
>>I guess the closest thing would be:
>>$ cd my_proj--main--0.1
>>$ bzr nick
>>(Until you set a nick, this will output the directory name,
>>"my_proj--main--0.1")
>
>
> just to be sure the command
> $ bzr nick
> did't existe yet ?
>
>
> Luis
>
> PS : I will collect my arch/tla usecases and put the bzr version on the
> wiki
>
>
-------------- 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/20051129/ceddd1a9/attachment.pgp
More information about the bazaar
mailing list