--- /dev/null
+Return-Path: <sojkam1@fel.cvut.cz>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 587FF4196F3\r
+ for <notmuch@notmuchmail.org>; Mon, 29 Mar 2010 02:03:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+ tests=[BAYES_00=-1.9] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id yZZ3BgFZ02an for <notmuch@notmuchmail.org>;\r
+ Mon, 29 Mar 2010 02:03:08 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 72C704196F2\r
+ for <notmuch@notmuchmail.org>; Mon, 29 Mar 2010 02:03:08 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.4])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id CF39C19F338E;\r
+ Mon, 29 Mar 2010 11:03:07 +0200 (CEST)\r
+X-Virus-Scanned: IMAP AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+ by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,\r
+ port 10044)\r
+ with ESMTP id 0nN6IxIXNsV6; Mon, 29 Mar 2010 11:03:06 +0200 (CEST)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id 8E90C19F330B;\r
+ Mon, 29 Mar 2010 11:03:06 +0200 (CEST)\r
+Received: from steelpick.2x.cz (k335-30.felk.cvut.cz [147.32.86.30])\r
+ (Authenticated sender: sojkam1)\r
+ by imap.feld.cvut.cz (Postfix) with ESMTPSA id 24D3BFA003;\r
+ Mon, 29 Mar 2010 11:03:05 +0200 (CEST)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.71)\r
+ (envelope-from <sojkam1@fel.cvut.cz>)\r
+ id 1NwAsD-0002rb-Ob; Mon, 29 Mar 2010 11:03:05 +0200\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: Sebastian Spaeth <Sebastian@SSpaeth.de>, David Edmondson <dme@dme.org>,\r
+ notmuch@notmuchmail.org\r
+In-Reply-To: <87pr2n1sar.fsf@SSpaeth.de>\r
+References: <87iq8o76r8.fsf@uf.hh.sledj.net> <87aatt2pf7.fsf@SSpaeth.de>\r
+ <87y6hdgfr3.fsf@steelpick.2x.cz> <87pr2n1sar.fsf@SSpaeth.de>\r
+Date: Mon, 29 Mar 2010 11:03:05 +0200\r
+Message-ID: <87k4svh54m.fsf@steelpick.2x.cz>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Subject: Re: [notmuch] JSON based emacs UI\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 29 Mar 2010 09:03:09 -0000\r
+\r
+On Mon, 29 Mar 2010, Sebastian Spaeth wrote:\r
+> On Sun, 28 Mar 2010 07:46:40 +0200, Michal Sojka <sojkam1@fel.cvut.cz> wrote:\r
+> > I don't think this can be solved only in Makefile. From my look at dme's\r
+> > repo, he adds a new subcomand 'part', which is used by the UI. So if you\r
+> > want to use the new UI and your other features, you need to merge the\r
+> > things together.\r
+> \r
+> I agree that notmuch and notmuch.el need to be developed deployed in\r
+> close cooperation. However, this bundling makes things a bit more\r
+> complex to untangle. I am willing to e.g. add the -part improvement to\r
+> my own branch of notmuch, but I want to follow dme's frontend closely.\r
+> \r
+> > To build my version of notmuch, I use an ugly script\r
+> > (http://rtime.felk.cvut.cz/gitweb/notmuch.git/blob/refs/heads/debian-wsh:/wsh-buildpackage)\r
+> > which first does a big octopus merge to combine several features to one\r
+> > branch and then I build notmuch from there. The current state of my\r
+> > integration can be seen at\r
+> > http://rtime.felk.cvut.cz/gitweb/notmuch.git/shortlog/refs/heads/integration/features.\r
+> \r
+> Interesting, but a bit more complicated that I was originally thinking off.\r
+> \r
+> > This approach has a disadvantage that integration/features branch is\r
+> > often rewritten (whenever I add, remove or change a patch) so that\r
+> > others cannot track the branch. On the other side, the advantage is that\r
+> > others can easily see which patches I have applied on top of master. If\r
+> > Carl updates master, I just rerun the script and the updated integration\r
+> > branch is ready (unless there is a merge conflict).\r
+> \r
+> Very nice.\r
+\r
+Here is a simplified version of my script. It does only the merge. If\r
+you want to use it, I recommend adding this script to a separate branch\r
+so that you can track which branched were added or removed to your\r
+features branch (you will modify the $branches variable in the script).\r
+\r
+#!/bin/sh\r
+\r
+branches="\r
+decode-headers-in-reply\r
+dme/citation-suffixes\r
+no-self-bcc-on-reply\r
+"\r
+\r
+set -e\r
+\r
+die()\r
+{\r
+ echo >&2 "fatal: $*"\r
+ exit 1\r
+}\r
+\r
+if [ -z "$EXEC_OK" ]; then\r
+ # If this script is tracked by repository, checking out another\r
+ # branch could delete it so we copy it to tmp and run it from\r
+ # there.\r
+ script=$(mktemp -t notmuch-integrate.XXXXXX)\r
+ cp "$0" "$script"\r
+ EXEC_OK=1\r
+ export EXEC_OK\r
+ exec sh "$script" "$@"\r
+fi\r
+\r
+[ $EXEC_OK != 1 ] && die "Error: something went wrong"\r
+\r
+trap "rm '$0'" EXIT\r
+\r
+git branch -D integration/features || :\r
+git checkout -b integration/features master\r
+git merge $branches\r
projects / notmuch-archives.git / commitdiff