Mike Kupfer <mike.kupfer at sun.com> writes:

> I'm not able to get past the comments for localtip().  You may have
> explained this to me on IRC yesterday, but I didn't save those logs, and
> I'm afraid I can't keep it all swapped in.

We did, and I adjusted the comments, I'll paste them and hope they
help if my answers don't.

        '''Return a tuple (changectx, workingctx) representing the most
           representative head to act as the local tip.

           The most representative head is taken to be (in order of
           preference):

           - If the dirstate is modified, its newest local dirstate
             parent revision (or newest dirstate parent revision , if
             neither is local).

           - The newest local head on the current branch.

           - The newest head on the current branch'''

> - What's the difference between "local parent" and "parent"?  Does
>   "local" mean "doesn't exist in the parent repo"?  (These are parent
>   changesets, yes?)

parent in that context meant "parent revision", hopefully clarified in
the comment above.

> - what does "accessible from the current dirstate parent" mean?  On the
>   same branch?

On this branch, merged into this branch, or prior to this branch being
created.

(there's an appropriate graph term, I just can't recall it.)

Perhaps "in our lineage" is a better way to put?

-- Rich

Reply via email to