On 8/9/12 12:00 AM, "Omar Gonzalez" wrote:
>>
>>
>>> My ultimate first choice would be to get this project on Git. :)
>> Maybe I'm missing something, but my read of the article was that the
>> "develop" branch was the same as "unstable" and is even more restrictive
>> about checkins to trunk
>
>
> > My ultimate first choice would be to get this project on Git. :)
> Maybe I'm missing something, but my read of the article was that the
> "develop" branch was the same as "unstable" and is even more restrictive
> about checkins to trunk than I was thinking. It just seems to want to use
> e
On 8/8/12 7:03 PM, "Omar Gonzalez" wrote:
> On Wed, Aug 8, 2012 at 7:00 PM, Justin Mclean wrote:
>
>> Hi,
>>
>>> It would be more like option two, the always branch system. Features,
>>> fixes, releases, are always done off branches.
>> I would not be against that, I don't like the overhead
On Wed, Aug 8, 2012 at 6:40 PM, Justin Mclean wrote:
> Hi,
>
> > I would use the name "alt-trunk" instead of "unstable" for the other
> > branch. Every rule that applies to trunk would apply to the alt-trunk
> > branch.
> The issue I see is having one single branch not the name. You would be
> fi
On Wed, Aug 8, 2012 at 7:00 PM, Justin Mclean wrote:
> Hi,
>
> > It would be more like option two, the always branch system. Features,
> > fixes, releases, are always done off branches.
> I would not be against that, I don't like the overhead and complexity it
> brings compared to working in trunk
Hi,
> It would be more like option two, the always branch system. Features,
> fixes, releases, are always done off branches.
I would not be against that, I don't like the overhead and complexity it brings
compared to working in trunk, but it doesn't have the issues that a single
unstable branch
On Wed, Aug 8, 2012 at 6:42 PM, Justin Mclean wrote:
> Hi,
>
> > This is an example of a good branching model:
> > http://nvie.com/posts/a-successful-git-branching-model/
>
> Yep and it uses multiple branches (ie equiv to option 3 in the SVN link I
> posted earlier) not a single branch as suggeste
Hi,
> This is an example of a good branching model:
> http://nvie.com/posts/a-successful-git-branching-model/
Yep and it uses multiple branches (ie equiv to option 3 in the SVN link I
posted earlier) not a single branch as suggested we use for Flex.
Justin
Hi,
> I would use the name "alt-trunk" instead of "unstable" for the other
> branch. Every rule that applies to trunk would apply to the alt-trunk
> branch.
The issue I see is having one single branch not the name. You would be fine
with the multi step step check in process (with unresolved issu
On Wed, Aug 8, 2012 at 3:50 PM, Alex Harui wrote:
>
>
>
> On 8/8/12 3:19 PM, "Justin Mclean" wrote:
>
> > No one has yet answered this:
> > How can you merge from unstable to trunk persons A changes when the
> unstable
> > branch contains persons A, B, C, D, E and F changes and each person may
>
Right now, very few people in this list have an idea of how complicated
the Flex codebase in trunk is. We dont even know how to run a single test
if we make a change a simple component. As a group, we are not ready to
start throwing code into trunk.
I would use the name "alt-trunk" instead of "
Hi,
> For those using eclipse, has anyone ever tried CollabNet eclipse plugin?
> It's from the same guys that created subclipse. Their interface makes all
> this merge process smoother and can even prevent you from merging if you
> don't follow SVN best practices.
If we go with a single unstable b
Hi,
>> How can you merge from unstable to trunk persons A changes when the unstable
>> branch contains persons A, B, C, D, E and F changes and each person may of
>> made multiple check ins at different (overlapping) times?
> You specify the revision number in the merge command.
And if they made mu
For those using eclipse, has anyone ever tried CollabNet eclipse plugin?
It's from the same guys that created subclipse. Their interface makes all
this merge process smoother and can even prevent you from merging if you
don't follow SVN best practices. Regarding merging between different
branches,
14 matches
Mail list logo
