All of lore.kernel.org
 help / color / mirror / Atom feed
* How to commit bug fixes from old revisions
@ 2009-12-18 15:02 Richard Rossel
  2009-12-18 15:15 ` Howard Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Richard Rossel @ 2009-12-18 15:02 UTC (permalink / raw)
  To: git

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.

Thanks for the help

-- 
Richard Rossel
Software Engineer at Airsage Inc.
Valparaiso - Chile

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: How to commit bug fixes from old revisions
  2009-12-18 15:02 How to commit bug fixes from old revisions Richard Rossel
@ 2009-12-18 15:15 ` Howard Miller
  0 siblings, 0 replies; 2+ messages in thread
From: Howard Miller @ 2009-12-18 15:15 UTC (permalink / raw)
  To: Richard Rossel; +Cc: git

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-12-18 15:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-18 15:02 How to commit bug fixes from old revisions Richard Rossel
2009-12-18 15:15 ` Howard Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.