Differences between revisions 3 and 4
⇤ ← Revision 3 as of 2009-05-19 19:31:00 →
Size: 771
Editor: localhost
Comment: converted to 1.6 markup
← Revision 4 as of 2010-11-20 23:25:57 → ⇥
Size: 749
Editor: abuehl
Comment: fix broken link
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== Merge changeset == = Merge Changeset =
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]]).
Line 9: Line 9:
Example of a merge changeset found in the Mercurial repository (http://selenic.com/repo/index.cgi/hg/rev/65f1b97484be, see [[DeveloperRepos]]): Example of a merge changeset found in the Mercurial repository: http://selenic.com/repo/hg/rev/65f1b97484be (see [[DeveloperRepos]]):
Line 12: Line 12:
> hg log -r 65f1b97484be --style default $ hg log -r 65f1b97484be

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)