From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on yquem.inria.fr X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=AWL autolearn=disabled version=3.1.3 Received: from mail3-relais-sop.national.inria.fr (mail3-relais-sop.national.inria.fr [192.134.164.104]) by yquem.inria.fr (Postfix) with ESMTP id 81D66BBC1 for ; Mon, 7 Apr 2008 22:09:31 +0200 (CEST) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEALIc+kfAXQIm/2dsb2JhbACmYIQ8 X-IronPort-AV: E=Sophos;i="4.25,618,1199660400"; d="scan'208";a="11180108" Received: from discorde.inria.fr ([192.93.2.38]) by mail3-smtp-sop.national.inria.fr with ESMTP; 07 Apr 2008 22:09:09 +0200 Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) by discorde.inria.fr (8.13.6/8.13.6) with ESMTP id m37K94St026438 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Mon, 7 Apr 2008 22:09:09 +0200 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjUBALIc+kdA6aaxd2dsb2JhbACRVwEMBQIFCRSUU4Q8 X-IronPort-AV: E=Sophos;i="4.25,618,1199660400"; d="scan'208";a="9305552" Received: from py-out-1112.google.com ([64.233.166.177]) by mail2-smtp-roc.national.inria.fr with ESMTP; 07 Apr 2008 22:09:08 +0200 Received: by py-out-1112.google.com with SMTP id u52so2449014pyb.10 for ; Mon, 07 Apr 2008 13:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; bh=0gYjHphKwkd5MWZ/Cbmkx2FTt5EXtG+EERocbspg2FQ=; b=CzywpxFLhc6Rl7am8VhKTQKyZIROQsEqVGp96GuvFGQt4/P3qDzmda0S5GW7nFqNW7NAiMLhL7wRzH12lOYaae5dEOdbkAOBHMXxbwbrxoTKQ2Sj+z05hGECO5UB4A3Lg/+q+Na5Qx9d08F3L7ZbtvHxmYgh7PQxrA2VEZBASN0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; b=JV+hRR0MYgqwqQ+143ZORRz7ZijISMuAfJbluSBD9rAF8e4xSTsfilLUYppHjDRsZCoTTqBA1Iakf1V3tLNNO7t3sqFt76UEv6LpQlp09gC+pM1HW2TyAH4Ezinv2C2IbwkLQUvdl+4tsCdrUcMeYDq4jahP9LBLcW+NZjdIr60= Received: by 10.35.67.18 with SMTP id u18mr9590742pyk.4.1207598947292; Mon, 07 Apr 2008 13:09:07 -0700 (PDT) Received: from ?192.168.0.11? ( [69.154.217.121]) by mx.google.com with ESMTPS id f57sm21691317pyh.43.2008.04.07.13.09.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 07 Apr 2008 13:09:06 -0700 (PDT) Message-ID: <47FA7F60.7060500@gmail.com> Date: Mon, 07 Apr 2008 15:09:04 -0500 From: Edgar Friendly User-Agent: Thunderbird 2.0.0.12 (X11/20080227) MIME-Version: 1.0 To: Sylvain Le Gall Cc: caml list Subject: Re: [Caml-list] Re: License question - QPL vs. SCM References: <200804071510.19669.peng.zang@gmail.com> <733916.43443.qm@web54605.mail.re2.yahoo.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Miltered: at discorde with ID 47FA7F60.000 by Joe's j-chkmail (http://j-chkmail . ensmp . fr)! X-Spam: no; 0.00; tarball:01 edgar:98 scm:98 scm:98 wrote:01 caml-list:01 annotated:02 seems:03 patches:03 patches:03 std:03 generally:04 qpl:05 qpl:05 thread:06 Sylvain Le Gall wrote: > I think distributing tarball + patches are ok, but a lot of SCM will > interleave changes which leads you to have a really borderline situation > where delta are not patches... This is a very dangerous interpretation. > I won't go this way -- because this thread will finish as a std battle > of what is SCM, how delta are stored et al... > > Regards, > Sylvain Le Gall > As noted in the annotated QPL [1], Any technique is acceptable for keeping changes separate - generally, you would have to mark changes very clearly for them to be separate. We don't want to hard-code the idea that the form must be patches. methods other than patches can satisfy the separate requirement. This seems to defuse the issue of delta != patch, at least in my mind. E [1] http://troll.no/products/qt/licenses/licensing/qpl-annotated