From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: Re: branchs and tags and merges oh my!
Date: Sat, 02 Jul 2011 09:44:50 -0300 [thread overview]
Message-ID: <87r568yhq5.fsf@zancas.localnet> (raw)
In-Reply-To: <87y60hn0mg.fsf@zancas.localnet>
[-- Attachment #1: Type: text/plain, Size: 898 bytes --]
On Fri, 01 Jul 2011 18:37:27 -0300, David Bremner <david@tethera.net> wrote:
>
> So now we have to decide what to do. FWIW, there are about 20 commits on
> release past d6f05fd.
>
> There are two obvious strategies going forward.
>
A third strategy is "git checkout master && git merge -s ours 0.6".
Then history will look like this:
freeze
--.-------------.----- master
\ /
-----------
release
As long as every patch on the release branch is already on master, -s
ours (which throws away all the changes from the side branch) is
reasonable.
This has the advantage that "git describe master" starts to count from
0.6 instead of 0.5. Currently e.g. "make dist" on master is making
notmuch-0.5-317-gd15faa1.tar.gz. Unless we are going for the
"increasingly innacurately named" effect, that is probably not what we
want.
d
[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]
next prev parent reply other threads:[~2011-07-02 12:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-01 21:37 branchs and tags and merges oh my! David Bremner
2011-07-01 21:48 ` Keith Packard
2011-07-01 23:47 ` David Bremner
2011-07-02 15:59 ` servilio
2011-07-02 17:30 ` David Bremner
2011-07-03 7:14 ` servilio
2011-07-03 12:44 ` David Bremner
2011-07-03 14:41 ` servilio
2011-07-02 12:44 ` David Bremner [this message]
2011-07-02 15:23 ` Tom Prince
2011-07-02 20:23 ` Jed Brown
2011-07-03 12:32 ` David Bremner
2011-07-03 14:30 ` servilio
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=87r568yhq5.fsf@zancas.localnet \
--to=david@tethera.net \
--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).