From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org, "Erik Sandberg" <mandolaerik@gmail.com>
Subject: Re: [StGit PATCH 0/6] Two bugfixes
Date: Mon, 24 Mar 2008 09:16:42 +0000 [thread overview]
Message-ID: <b0943d9e0803240216p2000dc23i41580ecc15102cd5@mail.gmail.com> (raw)
In-Reply-To: <20080324083550.GB23337@diana.vm.bytemark.co.uk>
On 24/03/2008, Karl Hasselström <kha@treskal.com> wrote:
> On 2008-03-20 15:19:12 +0000, Catalin Marinas wrote:
>
> > BTW, I have about 5 patches that apply to the stable and master
> > branch, mainly UI updates I needed recently (like picking multiple
> > patches at once). Since the master branch still needs some work
> > (which I'll try to help with), maybe it's worth releasing a 0.14.2,
> > together with some of the bugs reported so far.
>
>
> Absolutely. I think it would be worthwhile to treat "stable" much like
> Junio handles his "maint" -- apply minor and/or important fixes there,
> and release minor releases from it somewhat frequently. And merge it
> to master often, so that master always has everything stable has.
I'll try to release 0.14.2 today or tomorrow as I'll be on holiday
afterwards for 2.5 weeks.
BTW, on the master branch, I noticed that
StackTransaction.push_patch() checks whether the patch is empty before
pushing it. The behaviour on stable is that it reports whether it's
empty after push (just like "modified", so that you know that a patch
no longer has data as a result of the merge).
On the merging side during push, we have to add the plain patch
applying first followed by a three-way merge. Do we ever need the
Index.merge() function (implemented with git-read-tree) or should we
should always uses the git-recursive-merge in
IndexAndWorktree.merge()?
--
Catalin
next prev parent reply other threads:[~2008-03-24 9:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-20 0:31 [StGit PATCH 0/6] Two bugfixes Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 1/6] Use a special exit code for bugs Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 2/6] Make sure patches with no parents have an empty list of parents Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 3/6] Try uncommitting a commit with not exactly one parent Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 4/6] Make sure that we only uncommit commits with " Karl Hasselström
2008-03-20 0:31 ` [StGit PATCH 5/6] New test: conflicting push in dirty worktree Karl Hasselström
2008-03-20 0:32 ` [StGit PATCH 6/6] Handle failed pushes differently depending on cause Karl Hasselström
2008-03-20 15:19 ` [StGit PATCH 0/6] Two bugfixes Catalin Marinas
2008-03-24 8:35 ` Karl Hasselström
2008-03-24 9:16 ` Catalin Marinas [this message]
2008-03-24 18:12 ` Karl Hasselström
2008-03-25 10:46 ` Catalin Marinas
2008-03-25 11:05 ` Karl Hasselström
2008-03-25 15:27 ` Catalin Marinas
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=b0943d9e0803240216p2000dc23i41580ecc15102cd5@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=mandolaerik@gmail.com \
/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).