Differences between revisions 14 and 15
Revision 14 as of 2008-01-05 17:58:22
Size: 2303
Editor: abuehl
Comment:
Revision 15 as of 2008-01-05 18:45:04
Size: 2403
Editor: abuehl
Comment: corrections
Deletions are marked like this. Additions are marked like this.
Line 9: Line 9:
Conceptually, each changeset has zero, one or two ["Parent"] changesets. It has two parent changesets, if the commit was a ["Merge"]. It has no parent, if the change is a root in the repository. There may be multiple roots in a repository (normally, there is only one), each representing the start of branch. Each changeset has zero, one or two ["Parent"] changesets. It has two parent changesets, if the commit was a ["Merge"]. It has no parent, if the change is a root in the repository. There may be multiple roots in a repository (normally, there is only one), each representing the start of branch.
Line 13: Line 13:
Technically, the parent changesets of a changeset are retrieved from the revision history of the ["Manifest"]. Each changeset references a revision of the Manifest (see ["Design"] for the technical details). Technically, the parent changesets of a changeset are retrieved from the revision history of the changelog file in the repository (files {{{00changelog.i}}} and {{{00changelog.d}}} in {{{.hg/store}}}). Each changeset references a revision of the ["Manifest"] (see ["Design"] for the technical details).
Line 17: Line 17:
Committing changes in the working directory creates a new version of the manifest and a new changeset in the repository. The parent(s) of the working directory become the parents of the changeset. Committing changes in the working directory creates a new revision in the manifest and a new changeset (a new revision in the changelog). The parent(s) of the working directory become the parents of the changeset.
Line 19: Line 19:
"Updating" back to changeset which already has a child, changeing files and then commiting creates a new child, thus starting a new branch. Branches can be named (see ["NamedBranches"]). "Updating" back to a changeset which already has a child, changeing files and then commiting creates a new child, thus starting a new branch. Branches can be named (see ["NamedBranches"]).

Changeset

A changeset (sometimes abbreviated "cset") is an atomic collection of changes to files in a ["Repository"]. The act of creating a changeset is usually called a ["Commit"] or Checkin. The information in a changeset includes

  • changes to the contents of the files
  • changes to file names or other external attributes (such as execute permissions)
  • information about who made the change (the "committer"), why ("comments") and when (date/time, timezone)

Each changeset has zero, one or two ["Parent"] changesets. It has two parent changesets, if the commit was a ["Merge"]. It has no parent, if the change is a root in the repository. There may be multiple roots in a repository (normally, there is only one), each representing the start of branch.

If a changeset is not the ["Head"] of branch, it has one or more child changesets (it is then the parent of its child changesets).

Technically, the parent changesets of a changeset are retrieved from the revision history of the changelog file in the repository (files 00changelog.i and 00changelog.d in .hg/store). Each changeset references a revision of the ["Manifest"] (see ["Design"] for the technical details).

The ["WorkingDirectory"] can be ["Update"]d to any commited changeset of the repository, which then becomes the parent of the working directory.

Committing changes in the working directory creates a new revision in the manifest and a new changeset (a new revision in the changelog). The parent(s) of the working directory become the parents of the changeset.

"Updating" back to a changeset which already has a child, changeing files and then commiting creates a new child, thus starting a new branch. Branches can be named (see ["NamedBranches"]).

A changeset is identified uniquely by a ["ChangeSetID"]. In a single repository, you can identify it using a RevisionNumber.

  • Question: Is a changeset a particular state of the project (like a Subversion revision number), or is it a set of changes to files (like a Darcs patch)?

See also: ["ChangeSetComments"]


CategoryGlossary

ChangeSet (last edited 2018-02-03 04:31:09 by SangeetKumarMishra)