From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@eu.citrix.com>
Subject: Re: [PATCH 4 of 7] ocaml: resynchronise uuid library
	with xen-api-libs.hg
Date: Thu, 18 Nov 2010 12:27:02 +0000
Message-ID: <1290083222.31507.5290.camel@zakaz.uk.xensource.com>
References: <patchbomb.1290077432@zakaz.uk.xensource.com>
	<05cf9251ac48e7abeabd.1290077436@zakaz.uk.xensource.com>
	<1290079965.22729.211.camel@qabil.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <1290079965.22729.211.camel@qabil.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Gianni Tedesco <gianni.tedesco@citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, "xen-api@lists.xensource.com" <xen-api@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

On Thu, 2010-11-18 at 11:32 +0000, Gianni Tedesco wrote:
> On Thu, 2010-11-18 at 10:50 +0000, Ian Campbell wrote:
> > # HG changeset patch
> > # User root@localhost.localdomain
> > # Date 1290077186 18000
> > # Node ID 05cf9251ac48e7abeabdcf3c5a164b276bf393e9
> > # Parent  11cc3e6d573937508df213c0127c1dbbbd61af30
> > ocaml: resynchronise uuid library with xen-api-libs.hg
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> > diff -r 11cc3e6d5739 -r 05cf9251ac48 tools/ocaml/libs/uuid/uuid.ml
> > --- a/tools/ocaml/libs/uuid/uuid.ml	Thu Nov 18 05:46:26 2010 -0500
> > +++ b/tools/ocaml/libs/uuid/uuid.ml	Thu Nov 18 05:46:26 2010 -0500
> > @@ -1,7 +1,5 @@
> >  (*
> > - * Copyright (C) 2006-2007 XenSource Ltd.
> > - * Copyright (C) 2008      Citrix Ltd.
> > - * Author Vincent Hanquez <vincent.hanquez@eu.citrix.com>
> > + * Copyright (C) 2006-2009 Citrix Systems Inc.
> >   *
> 
> Hmm, I can understand folding in the redundant copyright claims but what
> is the deal with assertion of authorship?

I literally did a cp from xen-api-libs.hg. AIUI the two modules have a
shared ancestry with the xen-unstable version being imported from a
snapshot of xen-api-libs at some point. It looks like the copyright
headers were added to both trees independently after (or as part of) the
import and so the two versions have diverged.

I'll redo this as a less automated import and retain the authorship
statements in xen-unstable.hg -- doing otherwise was unintentional but
still impolite, sorry about that Vincent.

Ian.