Where are the revisions?

[John A Meinel]

Jan Hudec wrote:
> On Sun, Nov 20, 2005 at 11:24:40 -0500, Aaron Bentley wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Jan Hudec wrote:
>> | I just pulled bzr.dev branch and it does not seem to contain the merged in
>> | revisions. Is that expected behaviour of pull (that it does not bring them
>> | over), or is it a rolled-up merge or is it a bug in looking up revisions?
>> | I would certainly expect the following to work:
>>
>> No, what you're seeing is a bug in log; it requires the specified
>> revisions to be in the revision history of the branch.
> 
> But that revision *is* in the revision history of the branch. It is
> a non-first ancestor of some node, but IMHO that should be irrelevant for
> most purposes. I believe the first parent should only be special in that it's
> printed as 'mainline' in revision tree.

I think there needs to be a small clarification. It is in the "ancestry"
of the branch, but not the "revision-history" of the branch.

One is the "mainline", and the other is just things that have been merged.

Now, I think that log should be able to print the log for any revision
you have in the local store, so....
> 
> Should I file a bug report about log?
> 

Yes, file a bug saying that "bzr log" only supports revisions in the
revision-history.

At least one of the problems is that there is no revision number (revno)
for a revision that is not in the revision-history. Because revno is
just the index (+1) location in revision-history. It is not something
associated with commit, because when you have pull convergence, two
branches can have the same revision, but with a different revision
number. (If we get rid of pull convergence, then maybe each revision
will have a specific number, based on what branch it was committed in).

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051120/bcefb8ff/attachment.pgp