Differences between revisions 1 and 3 (spanning 2 versions)
⇤ ← Revision 1 as of 2008-05-18 12:33:07 →
Size: 345
Editor: abuehl
Comment: new page
← Revision 3 as of 2009-05-19 19:31:00 → ⇥
Size: 771
Editor: localhost
Comment: converted to 1.6 markup
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 [[Parent|parents]].
Line 5: Line 5:
A merge changeset is created by doing a `hg merge` followed by a `hg commit` (see [:Merge], [:Commit]). A merge changeset is created by doing a `hg merge` followed by a `hg commit` (see [[Merge]], [[Commit]]).
Line 7: Line 7:
Don't use `hg export` to transfer merge changesets between [:Repository:repositories] (see [:Export]). Don't use `hg export` to transfer merge changesets between [[Repository|repositories]] (see [[Export]]).

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

{{{
> hg log -r 65f1b97484be --style default
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
}}}

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/index.cgi/hg/rev/65f1b97484be, see DeveloperRepos): 

> hg log -r 65f1b97484be --style default
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)