This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


RE: [Xen-devel] What does the "Merge" do in changelog?

To: "Robin van Leeuwen" <rvl@xxxxxxxxxxx>, "xen-devel" <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: RE: [Xen-devel] What does the "Merge" do in changelog?
From: "Ian Pratt" <m+Ian.Pratt@xxxxxxxxxxxx>
Date: Sat, 20 Aug 2005 21:48:22 +0100
Delivery-date: Sat, 20 Aug 2005 20:46:32 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: AcWlwRn7VLFv5WC5SmqAF/8eG8RSSgABS+nQ
Thread-topic: [Xen-devel] What does the "Merge" do in changelog?
> I see a lot of "Merge" subjects in the changelog mailinglists.
> Forgive my ignorance :-) but is this some kind of special patch?

Mercurial currently isn't very smart about merging branches. Each merge
results in a changset (that has to be given a checkin comment), even if
the merge was entirely automatic. 

Since Mercurial's merge algorithm isn't as sophisticated as BK's, the
merge changeset is often quite large. Sometimes a little manual
intervention is required in the merge, but unfortunately this gets
incorporated into the same changeset and hence the manual edit usually
gets lost amongst the rest of the automated merge.

Mercurial is working out pretty well for us, but this is one area we're
hoping will improve over time.

BTW: We're planning on upgrading xenbits.xensource.com to Mercurial 0.6c
over the weekend. It's probably a good idea for developers to upgrade

One particular point to note about mercurial 0.6c is that 'hg init' is
no longer supported. You need to use 'hg clone', which works like the BK
command used to.


Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>