From: Michal Sojka <sojkam1@fel.cvut.cz>
To: Sebastian Spaeth <Sebastian@SSpaeth.de>,
David Edmondson <dme@dme.org>,
notmuch@notmuchmail.org
Subject: Re: JSON based emacs UI
Date: Mon, 29 Mar 2010 11:03:05 +0200 [thread overview]
Message-ID: <87k4svh54m.fsf@steelpick.2x.cz> (raw)
In-Reply-To: <87pr2n1sar.fsf@SSpaeth.de>
On Mon, 29 Mar 2010, Sebastian Spaeth wrote:
> On Sun, 28 Mar 2010 07:46:40 +0200, Michal Sojka <sojkam1@fel.cvut.cz> wrote:
> > I don't think this can be solved only in Makefile. From my look at dme's
> > repo, he adds a new subcomand 'part', which is used by the UI. So if you
> > want to use the new UI and your other features, you need to merge the
> > things together.
>
> I agree that notmuch and notmuch.el need to be developed deployed in
> close cooperation. However, this bundling makes things a bit more
> complex to untangle. I am willing to e.g. add the -part improvement to
> my own branch of notmuch, but I want to follow dme's frontend closely.
>
> > To build my version of notmuch, I use an ugly script
> > (http://rtime.felk.cvut.cz/gitweb/notmuch.git/blob/refs/heads/debian-wsh:/wsh-buildpackage)
> > which first does a big octopus merge to combine several features to one
> > branch and then I build notmuch from there. The current state of my
> > integration can be seen at
> > http://rtime.felk.cvut.cz/gitweb/notmuch.git/shortlog/refs/heads/integration/features.
>
> Interesting, but a bit more complicated that I was originally thinking off.
>
> > This approach has a disadvantage that integration/features branch is
> > often rewritten (whenever I add, remove or change a patch) so that
> > others cannot track the branch. On the other side, the advantage is that
> > others can easily see which patches I have applied on top of master. If
> > Carl updates master, I just rerun the script and the updated integration
> > branch is ready (unless there is a merge conflict).
>
> Very nice.
Here is a simplified version of my script. It does only the merge. If
you want to use it, I recommend adding this script to a separate branch
so that you can track which branched were added or removed to your
features branch (you will modify the $branches variable in the script).
#!/bin/sh
branches="
decode-headers-in-reply
dme/citation-suffixes
no-self-bcc-on-reply
"
set -e
die()
{
echo >&2 "fatal: $*"
exit 1
}
if [ -z "$EXEC_OK" ]; then
# If this script is tracked by repository, checking out another
# branch could delete it so we copy it to tmp and run it from
# there.
script=$(mktemp -t notmuch-integrate.XXXXXX)
cp "$0" "$script"
EXEC_OK=1
export EXEC_OK
exec sh "$script" "$@"
fi
[ $EXEC_OK != 1 ] && die "Error: something went wrong"
trap "rm '$0'" EXIT
git branch -D integration/features || :
git checkout -b integration/features master
git merge $branches
next prev parent reply other threads:[~2010-03-29 9:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 14:47 JSON based emacs UI David Edmondson
2010-03-22 15:52 ` David Edmondson
2010-03-24 7:32 ` David Edmondson
2010-03-24 15:41 ` David Edmondson
2010-03-25 4:41 ` Aneesh Kumar K. V
2010-03-25 9:14 ` David Edmondson
2010-03-26 4:46 ` Aneesh Kumar K. V
2010-03-26 8:26 ` David Edmondson
2010-03-26 9:07 ` Jesse Rosenthal
2010-03-26 12:28 ` David Edmondson
2010-03-26 14:51 ` Aneesh Kumar K. V
2010-03-26 19:38 ` David Edmondson
2010-03-28 17:03 ` Fernando Carrijo
2010-03-28 17:07 ` Fernando Carrijo
2010-03-29 9:17 ` David Edmondson
2010-03-29 9:27 ` Aneesh Kumar K. V
2010-03-29 14:17 ` Sebastian Spaeth
2010-03-29 14:59 ` Fernando Carrijo
2010-03-28 1:41 ` Sebastian Spaeth
2010-03-28 5:46 ` Michal Sojka
2010-03-29 7:49 ` Sebastian Spaeth
2010-03-29 9:03 ` Michal Sojka [this message]
2010-03-29 9:19 ` David Edmondson
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
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k4svh54m.fsf@steelpick.2x.cz \
--to=sojkam1@fel.cvut.cz \
--cc=Sebastian@SSpaeth.de \
--cc=dme@dme.org \
--cc=notmuch@notmuchmail.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.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
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 read-only IMAP folder(s) and NNTP newsgroup(s).