Trunk revnos have become dotted
Gary van der Merwe
garyvdm at gmail.com
Fri Apr 8 18:48:45 UTC 2011
On 08/04/2011 18:11, Alexander Belchenko wrote:
> Gordon Tyler пишет:
>> On Fri, 08 Apr 2011 16:34:38 +0200, John Arbash Meinel
>>> No, you already have revision "D" as your tip. What you can do, is sort
>>> out what rev B is, and then:
>>>
>>> bzr branch -r B ../new-trunk
>>> cd new-trunk
>>> bzr merge ../old-trunk
>>> bzr commit -m "New tip"
>>> bzr push ../old-trunk
>>> cd ../old-trunk
>>> bzr config append_revisions_only=True
>>
>> I'm using `bzr qlog colo:` as my method of looking at the history of all
>> the branches in my repo. That's where I was seeing trunk with dotted
>> revnos. After setting append_revisions_only it seems to have fixed the
>> revnos in qlog without having to make an additional commit. I did make
>> one
>> commit to trunk, a direct commit with a small change, but that was
>> before I
>> set append_revisions_only.
>>
>> As I recall, revnos are calculated at runtime and not stored with the
>> revision, right? Could it be that the dotted revnos on trunk were due to
>> the way `bzr qlog colo:` calculates the revnos and displays the repo
>> history?
>
> That could be: qlog tries to determine your trunk by simple logic, i.e.
> by branch name. Maybe you have several trunk in your colo workspace,
> then it's possible qlog selects wrong trunk. You can inspect that with
> bzr colo-branches command.
>
You can also tell qlog which branch is your trunk branch by passing it
as the first parameter. e.g.:
bzr qlog my_trunk colo:
Gary
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110408/3642345d/attachment.pgp>
More information about the bazaar
mailing list