From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-yb1-f178.google.com ([209.85.219.178]) by ewsd; Wed Sep 19 03:00:52 EDT 2018
Received: by mail-yb1-f178.google.com with SMTP id b3-v6so903610yba.4
        for <9front@9front.org>; Wed, 19 Sep 2018 00:00:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to;
        bh=pktMVeXyYxD/q0mOO6eEX9y2KSN16v1Yqd4+A9qSsaU=;
        b=LeHTKy7PeZwYGidwG5F7bx2FdxmoiKvHbgLINKtH/aJTWx3lrVE6bl9Lm3jmVF6UHL
         ro3CnKfNetQ8oh0nMHz8XU4OFJIPXnG9AYtYa1jfUwDMJGdMMMpAns8NlY1OFHPSQE2g
         WGwrMDR17CApLsT16dMkgdZ5IYF3ua+vYkAnadDTycrVet1jNztY9fBFhEoH7Bh1LgR0
         okrtuXoAI6RVRhWRJynhXlKNRlFuTrWTCYkj9zoWKsnx9FCTaaPdu8lo/aFJVB4hRzph
         jbJAUCQ4TBAI9a8sUaqmSRmkCd9xDvwPgAbLe36zakxqBSvrjwRStsa92NCdAlzc7N1c
         uDhw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:in-reply-to:references:from:date
         :message-id:subject:to;
        bh=pktMVeXyYxD/q0mOO6eEX9y2KSN16v1Yqd4+A9qSsaU=;
        b=Z1udrTdqk4G8MwOq+wx4pjHJ/UXjVrQwFXD4PfsTguyumhlsCFWKkq5ex4lw71LIY+
         AHR+AJ+elnHO9G07Lf90SziokSdiIBzANaI5aQ4yGPuR/rrQmmIy4TTN0mDS/+7AHcwA
         mvkZaCieVYQdfGcVpCBKDfwxN5ea5FXk5jHpfyI1xajx8EqL7aUo6W5R/7ghPbXa6Ajh
         xTKaEbEg/NbCi6B5GK1Q5EPTJaeHzLu89RFNz8zgYuqLMxLgTDuzzahiBiPIuaWDgur6
         loF0OQsfahp31d3XTYoskJ37NYhSMngpqHWBHEmqpNK8SnMrvq02QZYjWajQPFbsiu4h
         F8nA==
X-Gm-Message-State: APzg51Azg7hVSCi5myuBIhTE6PyaLqmuj+e3o/LFCN3AxMKACENDEbOm
	qYB2v9AcwzGgPv1Q3dWucDqN5zqDmphaem4ig2jLKA==
X-Google-Smtp-Source: ANB0VdYztY6rZRt19hzt3vXktfaVwbpnyl7I0EbJVaJNfhcFZwomUCH2t81jQJEumHl1Gl28i8RHBAmlNEEpIuDMbZM=
X-Received: by 2002:a25:620f:: with SMTP id w15-v6mr3368445ybb.269.1537340449531;
 Wed, 19 Sep 2018 00:00:49 -0700 (PDT)
MIME-Version: 1.0
Received: by 2002:a81:9113:0:0:0:0:0 with HTTP; Wed, 19 Sep 2018 00:00:49
 -0700 (PDT)
In-Reply-To: <CAFSF3XPyccBe+Vq-NhZv2n9HCPQj3Yx+zEm-8Cni9XJxDEFYvg@mail.gmail.com>
References: <CBDAA2129C96642848A16F5BA94720EE@felloff.net> <CADmmOS9HSacznjjot3wFDQD+3jDjave_M=ROnY5o7k4wPn=D_Q@mail.gmail.com>
 <CAFSF3XPyccBe+Vq-NhZv2n9HCPQj3Yx+zEm-8Cni9XJxDEFYvg@mail.gmail.com>
From: hiro <23hiro@gmail.com>
Date: Wed, 19 Sep 2018 09:00:49 +0200
Message-ID: <CAFSF3XPE8n09xktUyugqUwutbmveonweRzduuYArzuQRD7aiaQ@mail.gmail.com>
Subject: Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy
To: 9front@9front.org
Content-Type: text/plain; charset="UTF-8"
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: package-aware SQL NoSQL-based wrapper just-in-time realtime locator 

my approach is the following:
i use multiple branches for forks. i make sure all forks also have my same tail.
this way hg itself would notice a merge conflict when you merge
commits from another branch while there have been changes in the
meantime in our branch.
then you can check git blame and the old commit messages and dates.
possible even without 3-way diff.