Differences between revisions 1 and 7 (spanning 6 versions)
⇤ ← Revision 1 as of 2008-05-18 12:33:07 →
Size: 345
Editor: abuehl
Comment: new page
← Revision 7 as of 2012-11-08 16:32:51 → ⇥
Size: 725
Editor: abuehl
Comment: remove reference to deleted page "Export"
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== Merge changeset == = Merge Changeset =
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.
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]], [[Cmd: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]].

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
}}}

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.

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)