9front - general discussion about 9front
 help / color / mirror / Atom feed
From: hiro <23hiro@gmail.com>
To: 9front@9front.org
Subject: Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy
Date: Wed, 19 Sep 2018 09:00:49 +0200	[thread overview]
Message-ID: <CAFSF3XPE8n09xktUyugqUwutbmveonweRzduuYArzuQRD7aiaQ@mail.gmail.com> (raw)
In-Reply-To: <CAFSF3XPyccBe+Vq-NhZv2n9HCPQj3Yx+zEm-8Cni9XJxDEFYvg@mail.gmail.com>

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.


  reply	other threads:[~2018-09-19  7:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-18 23:36 cinap_lenrek
2018-09-19  0:34 ` Sean Hinchee
2018-09-19  6:55   ` hiro
2018-09-19  7:00     ` hiro [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-09-19 12:29 cinap_lenrek
2018-09-19  9:11 cinap_lenrek
2018-09-19 10:26 ` hiro
2018-09-19  9:08 cinap_lenrek
2018-09-18 23:41 cinap_lenrek
2018-09-17 21:49 cinap_lenrek
2018-09-18 23:22 ` Sean Hinchee
2018-09-17 20:54 Sean Hinchee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAFSF3XPE8n09xktUyugqUwutbmveonweRzduuYArzuQRD7aiaQ@mail.gmail.com \
    --to=23hiro@gmail.com \
    --cc=9front@9front.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).