On Mon, Sep 26, 2011 at 11:38, Chris Larson wrote:
...
> Just the other day I was doing a conversion from svn to git for a
> project and ran into a related issue. There was no merge metadata in
> svn from the release branches back to master, so now I have to
> painstakingly step through and make a
On Mon, Sep 26, 2011 at 5:47 AM, Richard Purdie
wrote:
> On Mon, 2011-09-26 at 09:27 -0300, Otavio Salvador wrote:
>> On Mon, Sep 26, 2011 at 06:23, Richard Purdie
>> wrote:
>> ...
>> > FWIW, something like git cherry can identify your local changes so you
>> > could apply them on top of master s
On Mon, Sep 26, 2011 at 09:47, Richard Purdie
wrote:
...
> To illustate the problem, if a change is needed in two different release
> branches you'd commit to both and then cherry-pick both into master?
No, I'd merge it into master.
--
Otavio Salvador O.S. Systems
E-
On Mon, 2011-09-26 at 09:27 -0300, Otavio Salvador wrote:
> On Mon, Sep 26, 2011 at 06:23, Richard Purdie
> wrote:
> ...
> > FWIW, something like git cherry can identify your local changes so you
> > could apply them on top of master so there are other ways to make your
> > usecase work...
>
> Th
On Mon, Sep 26, 2011 at 06:23, Richard Purdie
wrote:
...
> FWIW, something like git cherry can identify your local changes so you
> could apply them on top of master so there are other ways to make your
> usecase work...
This breaks the value of using a SCM since you won't have a common parent.
On Fri, 2011-09-23 at 15:12 -0300, Otavio Salvador wrote:
> On Fri, Sep 23, 2011 at 14:30, Richard Purdie
> wrote:
> ...
> > I don't really see the point of this. Basically you're asking that every
> > time there is a commit to the branch there is also a merge commit. You
> > can just as easily ei
On Fri, Sep 23, 2011 at 11:12 AM, Otavio Salvador
wrote:
> On Fri, Sep 23, 2011 at 14:30, Richard Purdie
> wrote:
> ...
>> I don't really see the point of this. Basically you're asking that every
>> time there is a commit to the branch there is also a merge commit. You
>> can just as easily eithe
On Fri, Sep 23, 2011 at 14:30, Richard Purdie
wrote:
...
> I don't really see the point of this. Basically you're asking that every
> time there is a commit to the branch there is also a merge commit. You
> can just as easily either force a checkout of master, or merge against
> master with a one
On Fri, 2011-09-23 at 13:41 -0300, Otavio Salvador wrote:
> On Thu, Sep 22, 2011 at 20:33, Richard Purdie
> wrote:
> > On Thu, 2011-09-22 at 09:49 -0300, Otavio Salvador wrote:
> >> I noticed the 2011-1 branch today and it seems it is not fully merged
> >> into master; this is a mistake since it w
On Thu, Sep 22, 2011 at 20:33, Richard Purdie
wrote:
> On Thu, 2011-09-22 at 09:49 -0300, Otavio Salvador wrote:
>> I noticed the 2011-1 branch today and it seems it is not fully merged
>> into master; this is a mistake since it will create an upgrade path
>> problem for users of it.
>
> Its a bra
On Thu, 2011-09-22 at 09:49 -0300, Otavio Salvador wrote:
> I noticed the 2011-1 branch today and it seems it is not fully merged
> into master; this is a mistake since it will create an upgrade path
> problem for users of it.
Its a branch, master continues on, that branch just gets fixes suitable
Hello,
I noticed the 2011-1 branch today and it seems it is not fully merged
into master; this is a mistake since it will create an upgrade path
problem for users of it.
How this is going to be managed?
--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br
12 matches
Mail list logo
