bzr heads help

Alexander Belchenko bialix at ukr.net
Tue Aug 30 08:00:01 UTC 2011


Martin Pool пишет:
> On 30 August 2011 17:38, John Arbash Meinel <john at arbash-meinel.com> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 8/30/2011 9:25 AM, Eli Zaretskii wrote:
>>>> Date: Tue, 30 Aug 2011 09:56:27 +0300 From: Alexander Belchenko
>>>> <bialix at ukr.net> Cc: bazaar at lists.canonical.com
>>>>
>>>>> 2. What is the difference between live and dead heads? My guess
>>>>> is that a live head is one that exists in a branch, but has not
>>>>> been merged into any other branch?
>>>> live head -- exists in the branch as branch tip.
>>>>
>>>> dead head -- tip revision not in the branch.
>>>>
>>>> Dead head created by `bzr uncommit`, `bzr merge && bzr revert` or
>>>> `bzr pull --overwrite` (losing your local history). The purpose
>>>> of `heads` command is to be able to find revision ids for lost
>>>> revisions.
>>> It would be _really_ nice to have all this information as part of
>>> "bzr help heads".
>>>
>>> TIA
>>>
>> 'bzr merge && bzr revert' doesn't create a dead head, because 'merge'
>> doesn't create a node. You can only create nodes with 'commit'. And
>> pull them into your graph with pull, etc.
> 
> Well, merge won't create a revision, but in the common case of merging
> from a separate repository it will implicitly fetch them, which I
> guess is what Alexander was thinking of.

Sorry I was unclear, I've meant that merge will fetch new revisions and 
they will be present in the repository so can be found by `bzr heads`, 
as Martin said.




More information about the bazaar mailing list