Diff for "MergeChangeset"

Differences between revisions 1 and 2

Merge changeset

A merge changeset is a [:ChangeSet:changeset] with two [:Parent: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 [: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

CategoryGlossary

-  ⇤ ← Revision 1 as of 2008-05-18 12:33:07 → 
  Size: 345
  Editor: abuehl
  Comment: new page
+   ← Revision 2 as of 2008-05-18 13:06:18 → ⇥
  Size: 764
  Editor: abuehl
  Comment: +example
-Deletions are marked like this.
+Additions are marked like this.
 Line 9:
+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
}}}