[cmake-developers] CPack API redesign

[David Cole]

On Wed, Aug 11, 2010 at 6:21 PM, Eric Noulard <eric.noulard at gmail.com>wrote:

> 2010/8/12 Eric Noulard <eric.noulard at gmail.com>:
> > 2010/8/11 David Cole <david.cole at kitware.com>:
> >>
> >> We branch from the commit that was merged into next, not next itself, to
> >> continue work that was begun based on master but is not merged back into
> >> master yet.
> >> So... find the commit that Brad made that fixed the warnings, which I
> think
> >> is this one:
> >>
> http://cmake.org/gitweb?p=cmake.git;a=commit;h=31a313d47043923bc722554175912e75a03a13f6
> >> And then begin a new branch from there:
> >> git checkout -b CPack-APIredesign 31a313d4
> >
> > I yes, I didn't even thought it was possible to branch from
> > a particular commit, too simple.
>
> Ok too simple indeed.
> I need other commit in next which are not in master.
> Shall I merge those commits on my fresh new
> branch as suggested by Clint:
> "and merge your dependent topic branches into your new branch"
>
> Sorry for my almost git-newbie questions...
>

I think so. Just start a new branch from one of them, and then merge in the
others that you need also. As long as they also already appear in next then
there should not be any issues merging your new work into next when it is
done.

HTH,
David



>
> --
> Erk
> Membre de l'April - « promouvoir et défendre le logiciel libre » -
> http://www.april.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20100811/a7af99de/attachment.html>