You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Justin Mclean <ju...@classsoftware.com> on 2014/08/23 05:32:41 UTC

Git merge issue in Flex utilities

Hi,

And look like we have as issue with merging into master in the Flex utilities git repo due to it's structure.

If I merged the tag "ApacheFlexTourDeFlex1.0" into master it would also pick up a whole lot of other changes done in the other directories, Cherry picking seems impossible as you need to cherry pick every commit that you need manually. Any ideas?

Thanks,
Justin

RE: Git merge issue in Flex utilities

Posted by Frédéric THOMAS <we...@hotmail.com>.
Sorry, I meant TDF :-)

Frédéric THOMAS

> From: webdoublefx@hotmail.com
> To: dev@flex.apache.org
> Subject: RE: Git merge issue in Flex utilities
> Date: Sat, 23 Aug 2014 12:28:58 +0100
> 
> 
> 
> 
> There are many things now in this repo, couldn't itbe useful to split it 
> up into pieces, especially for the Installer and blazeDS ?
> 
> Frédéric THOMAS
> 
> > From: aharui@adobe.com
> > To: dev@flex.apache.org
> > Subject: Re: Git merge issue in Flex utilities
> > Date: Sat, 23 Aug 2014 06:38:35 +0000
> > 
> > 
> > 
> > On 8/22/14 11:15 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
> > 
> > >Hi,
> > >
> > >> Agreed, and so, lesson learned: this is why we do need to cut release
> > >> branches even if there isn't much going on in develop branch.  Or would
> > >> the release branch also contain these blazeDS and the merge would have
> > >> tired to merge them?
> > >A release branch would of been of little help here. The issue is that we
> > >have several projects in a git repo each under their own directory and
> > >git prefers one project per repo.
> > Should we ask for more repos?  Or maybe just one where new donations go
> > until released?
> > 
> > -Alex
> > 
> 
>  		 	   		  
 		 	   		  

RE: Git merge issue in Flex utilities

Posted by Frédéric THOMAS <we...@hotmail.com>.


There are many things now in this repo, couldn't itbe useful to split it 
up into pieces, especially for the Installer and blazeDS ?

Frédéric THOMAS

> From: aharui@adobe.com
> To: dev@flex.apache.org
> Subject: Re: Git merge issue in Flex utilities
> Date: Sat, 23 Aug 2014 06:38:35 +0000
> 
> 
> 
> On 8/22/14 11:15 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
> 
> >Hi,
> >
> >> Agreed, and so, lesson learned: this is why we do need to cut release
> >> branches even if there isn't much going on in develop branch.  Or would
> >> the release branch also contain these blazeDS and the merge would have
> >> tired to merge them?
> >A release branch would of been of little help here. The issue is that we
> >have several projects in a git repo each under their own directory and
> >git prefers one project per repo.
> Should we ask for more repos?  Or maybe just one where new donations go
> until released?
> 
> -Alex
> 

 		 	   		  

Re: Git merge issue in Flex utilities

Posted by Alex Harui <ah...@adobe.com>.

On 8/22/14 11:15 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:

>Hi,
>
>> Agreed, and so, lesson learned: this is why we do need to cut release
>> branches even if there isn't much going on in develop branch.  Or would
>> the release branch also contain these blazeDS and the merge would have
>> tired to merge them?
>A release branch would of been of little help here. The issue is that we
>have several projects in a git repo each under their own directory and
>git prefers one project per repo.
Should we ask for more repos?  Or maybe just one where new donations go
until released?

-Alex


Re: Git merge issue in Flex utilities

Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,

> Agreed, and so, lesson learned: this is why we do need to cut release
> branches even if there isn't much going on in develop branch.  Or would
> the release branch also contain these blazeDS and the merge would have
> tired to merge them?
A release branch would of been of little help here. The issue is that we have several projects in a git repo each under their own directory and git prefers one project per repo.

Justin

Re: Git merge issue in Flex utilities

Posted by Mark Kessler <ke...@gmail.com>.
Only if the release branches didn't bring over other changes too.  Unlike
some of our other repo's this one has many balls in the air at a time.


-Mark


On Sat, Aug 23, 2014 at 1:25 AM, Alex Harui <ah...@adobe.com> wrote:

>
>
> On 8/22/14 9:47 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
>
> >Hi,
> >
> >> I think for already released products, master should only get updated
> >>with
> >> a released copy.  But it is a good question about whether the donations
> >> should have been dropped into master as the master copy of the
> >>ip-cleared
> >> donation, even if they weren't ready to go.  So that's why I'm ok with
> >>you
> >> merging the whole thing.
> >
> >Fair enough done - this is going to get tricky in the future however.
> >
> >And there will be some stuff that probably strictly shouldn't be in
> >master ie mavinizer and blaze DS unreleased changes.
> Agreed, and so, lesson learned: this is why we do need to cut release
> branches even if there isn't much going on in develop branch.  Or would
> the release branch also contain these blazeDS and the merge would have
> tired to merge them?  Or does a merge only apply diffs from the branch
> point so it would work?
>
> And also, motivation to release those yet-to-be-released entities.  I saw
> Chris mention he might try to do BlazeDS>
>
> -Alex
>
>

Re: Git merge issue in Flex utilities

Posted by Alex Harui <ah...@adobe.com>.

On 8/22/14 9:47 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:

>Hi,
>
>> I think for already released products, master should only get updated
>>with
>> a released copy.  But it is a good question about whether the donations
>> should have been dropped into master as the master copy of the
>>ip-cleared
>> donation, even if they weren't ready to go.  So that's why I'm ok with
>>you
>> merging the whole thing.
>
>Fair enough done - this is going to get tricky in the future however.
>
>And there will be some stuff that probably strictly shouldn't be in
>master ie mavinizer and blaze DS unreleased changes.
Agreed, and so, lesson learned: this is why we do need to cut release
branches even if there isn't much going on in develop branch.  Or would
the release branch also contain these blazeDS and the merge would have
tired to merge them?  Or does a merge only apply diffs from the branch
point so it would work?

And also, motivation to release those yet-to-be-released entities.  I saw
Chris mention he might try to do BlazeDS>

-Alex


Re: Git merge issue in Flex utilities

Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,

> I think for already released products, master should only get updated with
> a released copy.  But it is a good question about whether the donations
> should have been dropped into master as the master copy of the ip-cleared
> donation, even if they weren't ready to go.  So that's why I'm ok with you
> merging the whole thing.

Fair enough done - this is going to get tricky in the future however.

And there will be some stuff that probably strictly shouldn't be in master ie mavinizer and blaze DS unreleased changes.

Thanks,
Justin

Re: Git merge issue in Flex utilities

Posted by Alex Harui <ah...@adobe.com>.

On 8/22/14 8:57 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:

>Hi,
>
>> Merge the whole thing.  I don't think I remembered to merge the last few
>> Installer releases anyway.
>
>If we merge the whole ting we get unreleased files/changes in master. I
>thought the whole point was mast was only what had been released.
I think for already released products, master should only get updated with
a released copy.  But it is a good question about whether the donations
should have been dropped into master as the master copy of the ip-cleared
donation, even if they weren't ready to go.  So that's why I'm ok with you
merging the whole thing.

I think your only other option is to remove everything from flex-utilities
that hasn't been released, do the merge with master, then restore
everything.  I'm ok with you doing that.  I'm not doing a whole lot in
that branch right now.  Sounds risky though.

-Alex


Re: Git merge issue in Flex utilities

Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,

> Merge the whole thing.  I don't think I remembered to merge the last few
> Installer releases anyway.

If we merge the whole ting we get unreleased files/changes in master. I thought the whole point was mast was only what had been released.

Justin


Re: Git merge issue in Flex utilities

Posted by Alex Harui <ah...@adobe.com>.
Merge the whole thing.  I don't think I remembered to merge the last few
Installer releases anyway.


On 8/22/14 8:32 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:

>Hi,
>
>And look like we have as issue with merging into master in the Flex
>utilities git repo due to it's structure.
>
>If I merged the tag "ApacheFlexTourDeFlex1.0" into master it would also
>pick up a whole lot of other changes done in the other directories,
>Cherry picking seems impossible as you need to cherry pick every commit
>that you need manually. Any ideas?
>
>Thanks,
>Justin