>>>>> "Rich" == Richard Lowe <richlowe at richlowe.net> writes:
Mike> - What's the difference between "local parent" and "parent"? Does Mike> "local" mean "doesn't exist in the parent repo"? Mike> I still need confirmation that I got this right (or a correction). Rich> Sorry, yes, "local" as in "not in the parent". If you want to Rich> suggest a better way to phrase all this, that'd be great, since Rich> clearly I did it terribly. I think using "local" that way is fine, as long as it's defined somewhere in the comments. I'm not sure just where, though. I think the comments for localtip() would be best, but maybe the "theory" comments at the top of WorkSpace.py would be better? But if somewhere else seems better, go for it. Rich> I changed it to 'on the current branch', to include branches Rich> merged into the current branch. Rich> If that's clearer, yes, ignore it. Yeah, that's clearer. I also went back and reviewed the section on named branches in bos's Mercurial book. That helped, too. In fact, if you think it would be useful, feel free to stick a pointer to that part of the book in the comments. cheers, mike
