Meaning of 'parents' (was: Re: Is this the expected revert behaviour ?)

Thomas Arendsen Hein thomas at intevation.de
Thu May 11 06:34:32 CDT 2006


* Junk Blocker <junkblocker at yahoo.com> [20060506 01:17]:
> Coming
> from Teamware, it was really confusing when "parent"
> was used to describe two totally different things on
> the wiki.

Just think of the working directory as a separate revision. The
parents of the working directory map 1:1 to the parents of the
changesets created when you commit.

When updating with local changes in the working directory, there's
even a 3-way-merge done as it would happen with merging changesets.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/


More information about the Mercurial mailing list