Mike Kupfer <mike.kupfer at sun.com> writes: >>>>>> "Rich" == Richard Lowe <richlowe at richlowe.net> writes: > >> '''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''' > > Mike> - What's the difference between "local parent" and "parent"? Does > Mike> "local" mean "doesn't exist in the parent repo"? > > I still need confirmation that I got this right (or a correction).
Sorry, yes, "local" as in "not in the parent". If you want to suggest a better way to phrase all this, that'd be great, since clearly I did it terribly. >>> - what does "accessible from the current dirstate parent" mean? On >>> the same branch? > > Rich> On this branch, merged into this branch, or prior to this branch > Rich> being created. > > Still confused. Maybe I should just forget about "accessible from the > current dirstate parent", since you've dropped that phrase? I changed it to 'on the current branch', to include branches merged into the current branch. If that's clearer, yes, ignore it. -- Rich
