From: Howard Miller <howardsmiller@googlemail.com>
To: Richard Rossel <rrossel@inf.utfsm.cl>
Cc: git@vger.kernel.org
Subject: Re: How to commit bug fixes from old revisions
Date: Fri, 18 Dec 2009 15:15:46 +0000 [thread overview]
Message-ID: <26ae428a0912180715v15d85fbcm9fef7c33f6ccf448@mail.gmail.com> (raw)
In-Reply-To: <4B2B996D.9070302@inf.utfsm.cl>
2009/12/18 Richard Rossel <rrossel@inf.utfsm.cl>:
> Hi,
> I'm confused with how to commit bug fixes from old tagged version.
> Lets says that I have a serie of tags (v1.0, v1.1, v1.2, v2.0) in master,
> and there is a bug from v.1.2. The bug was fixed, but I don't
> want to merge to v2.0, because there are not compatibles. The bug fixed
> should be
> tagged as v1.3
>
> So the question is how to commit between revisions( in the example, between
> v.1.2 and v2.0),
> without made any change in the HEAD of master (v2.0)
>
> Or maybe the solution is to separate the versions in different branches or
> different repos.
I think it depends on how you look at it. The tag implies that v1.3
is a fixed release but what you say implies a branch. What I would do
is have a (say) '1.3_RELEASE" branch and that has the various fixes
merged on it. To put it another way, does your fix mean that there'll
be a v1.3.1? If so you would be tagging that on the 1.3 branch
(probably).
HTH
prev parent reply other threads:[~2009-12-18 15:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-18 15:02 How to commit bug fixes from old revisions Richard Rossel
2009-12-18 15:15 ` Howard Miller [this message]
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=26ae428a0912180715v15d85fbcm9fef7c33f6ccf448@mail.gmail.com \
--to=howardsmiller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=rrossel@inf.utfsm.cl \
/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