Differences between revisions 5 and 6
⇤ ← Revision 5 as of 2012-11-06 15:12:34 →
Size: 753
Editor: abuehl
Comment: remove link to deleted page "commit" (use cmd link instead)
← Revision 6 as of 2012-11-06 15:14:25 → ⇥
Size: 742
Editor: abuehl
Comment: remove link to deleted page "parent"
Deletions are marked like this. Additions are marked like this.
Line 3: Line 3:
A '''merge changeset''' is a [[ChangeSet|changeset]] with two [[Parent|parents]]. A '''merge changeset''' is a [[ChangeSet|changeset]] with two parents.

Merge Changeset

A merge changeset is a changeset with two parents.

A merge changeset is created by doing a 'hg merge' followed by a 'hg commit' (see Merge, commit).

Don't use 'hg export' to transfer merge changesets between repositories (see Export).

Example of a merge changeset found in the Mercurial repository: http://selenic.com/repo/hg/rev/65f1b97484be (see DeveloperRepos): 

$ hg log -r 65f1b97484be
changeset:   6533:65f1b97484be
parent:      6532:833be17000b6
parent:      6531:2b181fb3a70a
user:        Matt Mackall <mpm@selenic.com>
date:        Sun Apr 13 11:31:45 2008 -0500
summary:     Merge with -stable

CategoryGlossary

MergeChangeset (last edited 2012-11-08 16:32:51 by abuehl)