Re: [mylyn-reviews-dev] Reviews and R4E development repositories

[Alvaro Sanchez <alvsan09@xxxxxxxxx>]

We should be able to reset master to any existing commit and leave the integration branch with the new changes, no merges or re-base involved.

On Tue, Oct 2, 2012 at 2:54 PM, Miles Parker <miles.parker@xxxxxxxxxxx> wrote:

Sure, we can do that. I think the rationale for the current approach was simply that the purpose of this fork was to manage the proposed changes, but it doesn't add any

We won't be able to reset master because the repos is non-fast-froward. :( I wish we could because of huge diff issue we just ran in to.

On 2012-10-02, at 11:51 AM, Alvaro Sanchez <alvsan09@xxxxxxxxx> wrote:

> Hello Miles,
> I see you are using master to add your changes to the git repository,
> Shouldn't we use a different branch so you allow master to be in sync with the eclipse.org repo and your branch re-bases to it over time ?
>    Having a separate branch allows to simply define a new remote to our local repositories and fetch your changes in a branch which does not need special mapping from master.
>
> changing the setup to use a different branch for development shall be fairly simple
>     1, creating a new one from the current master
>     2. reset master to the commit used as the base for your changes
>     3. pull current changes from eclipse org to keep master in sync
>
>
> Regards
> /Alvaro
>
>
>
> On Mon, Oct 1, 2012 at 2:12 PM, Miles Parker <miles.parker@xxxxxxxxxxx> wrote:
>
> Just wanted to point the community to the active development branch for the Reviews and R4E model changes effort. We've decided to do the development on github and then move it over to Eclipse git once everyone is satisfied with the changes. You can access the development repos here:
>
> https://github.com/Tasktop/mylyn.reviews
> https://github.com/Tasktop/mylyn.reviews.r4e
>
> See: 324327: Define a common model for reviews https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327
>
> (All changes are likely to be on master.)
>
> I'll be pushing a great deal of changes to R4E, probably later today. To make things a bit more confusing, I'll probably also be pushing some smaller changes through gerrit which when approved will show up on the Eclipse masters.
>
> cheers,
>
> Miles
>
> _______________________________________________
> mylyn-reviews-dev mailing list
> mylyn-reviews-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-reviews-dev
>
> _______________________________________________
> mylyn-reviews-dev mailing list
> mylyn-reviews-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-reviews-dev

_______________________________________________
mylyn-reviews-dev mailing list
mylyn-reviews-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mylyn-reviews-dev