Diff for "ChangeSet"

Differences between revisions 44 and 45

This page is proposed for deletion. See our wiki cleanup plan for more information.

Changeset

(for a short intro of the basic concepts of Mercurial, see UnderstandingMercurial)

A changeset (sometimes abbreviated "cset") is an atomic collection of changes to files in a repository. It contains all recorded local modfication that lead to a new revision of the repository.

A changeset is identified uniquely by a changeset ID. In a single repository, you can identify it using a revision number.

The act of creating a changeset is called a commit or checkin. A changeset includes the actual changes to the files and some meta information. The meta information in a changeset includes:

the nodeid of its manifest
the list of changed files
information about who made the change (the "committer"), why ("comments") and when (date/time, timezone)
the name of the branch ("default", if omitted or not set)

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 changeset is a root in the repository. There may be multiple roots in a repository (normally, there is only one), each representing the start of a branch.

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

The working directory can be updated to any commited changeset of the repository, which then becomes the parent of the working directory.

"Updating" back to a changeset which already has a child, changing files and then committing creates a new child changeset, thus starting a new branch. Branches can be named.

All changesets of a repository are stored in the changelog.

Here's what the internal representation of a changeset looks like:

$ hg debugdata .hg/00changelog.d 1208
1102691ceab8c8f278edecd80f2e3916090082dd <- the corresponding manifest nodeid
mpm@selenic.com <- the committer
1126146623 25200 <- the date, in seconds since the epoch, and seconds offset from UTC
mercurial/commands.py <- the list of changed files, followed by the commit message

Clean up local clone file list

We now use an explicit list of files to copy during clone so that we
don't copy anything we shouldn't.

-  ⇤ ← Revision 44 as of 2013-08-28 00:49:28 → 
  Size: 431
  Editor: Katherine
  Comment:
+   ← Revision 45 as of 2013-08-28 00:55:36 → ⇥
  Size: 2539
  Editor: rcl
  Comment: reverting to rev 43 (spam)
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-Annelle is my name plus I totally dig which name. Years ago we moved to New Mexico. Administering databases is my day job today and it's anything I love. It's not a popular thing nevertheless what I like doing is playing baseball plus I would never give it up. I've been working about my website for certain time today. Check it out here: http://www.phy.ntnu.edu.tw/tiki/tiki-view_forum_thread.php?comments_parentId=526&forumId=1
+<<Include(A:delete)>>

== Changeset ==

''(for a short intro of the basic concepts of Mercurial, see UnderstandingMercurial)''

A '''changeset''' (sometimes abbreviated "cset") is an atomic collection of changes to files in a [[Repository|repository]]. It contains all recorded [[LocalModifications|local modfication]] that lead to a new [[Revision|revision]] of the repository.

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

The act of creating a changeset is called a commit or checkin. A changeset includes the actual changes to the files and some meta information. The meta information in a changeset includes:

 * the [[Nodeid|nodeid]] of its [[Manifest|manifest]]
 * the list of changed files
 * information about who made the change (the "committer"), why ("comments") and when (date/time, timezone)
 * the name of the [[Branch|branch]] ("default", if omitted or not set)

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

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

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

"Updating" back to a changeset which already has a child, changing files and then committing creates a new child changeset, thus starting a new branch. Branches can be [[NamedBranches|named]].

All changesets of a repository are stored in the changelog.

Here's what the internal representation of a changeset looks like:
{{{
$ hg debugdata .hg/00changelog.d 1208
1102691ceab8c8f278edecd80f2e3916090082dd <- the corresponding manifest nodeid
mpm@selenic.com <- the committer
1126146623 25200 <- the date, in seconds since the epoch, and seconds offset from UTC
mercurial/commands.py <- the list of changed files, followed by the commit message

Clean up local clone file list

We now use an explicit list of files to copy during clone so that we
don't copy anything we shouldn't.

}}}

See also: [[ChangeSetComments]], [[Design]]

----
CategoryGlossary

[[FrenchChangeSet|Français]]