Where are the revisions?
Aaron Bentley
aaron.bentley at utoronto.ca
Sun Nov 20 17:27:32 GMT 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jan Hudec wrote:
| On Sun, Nov 20, 2005 at 11:24:40 -0500, Aaron Bentley wrote:
|>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.
No, it's in the ancestry, which is different. The revision history is a
linear, chronological list of revisions that were committed or pulled
(but not merged) into a branch. Each revision in the revision history
has a revno. Others do not.
| It is
| a non-first ancestor of some node, but IMHO that should be irrelevant for
| most purposes.
First or non-first has no bearing on whether or not it's in the revision
history.
For most operations, including "log -r foo", I agree that it shouldn't
matter whether it's in the revision history or not.
For "log -r foo..bar", the definition is clearer and the implementation
is much simpler if you require that foo and bar are in the revision
history. That guarantees that there's a well-defined path from one to
the other, and that one is the ancestor of the other. Even if you
require that one be an ancestor of the other, it's still not defined
which path should be taken from one to the other.
Unfortunately, the requirement for the two-revision form seems to have
leaked over into the one-revision form.
| Should I file a bug report about log?
Sure, if there's not one already.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDgLID0F+nu1YWqI0RAot8AJ4g6/r/fZ3vTIWHCpnLLFtKcJUmzwCeJLx/
hBqBTwDeq/V0mqd+b/xr1sI=
=D2Xy
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list