Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [mylyn-reviews-dev] Reviews and R4E development repositories


Yep. I'm going to do that once I've got my most recent batch of changes safely on a clean branch -- which is waiting on the CRLF fix. Except for the actual common model, these branches were all for stuff like testing commit issues and paranoid failsafes for prior commits. :) None of them are actually active dev branches.

On Tue, Oct 2, 2012 at 6:26 PM, Alvaro Sanchez <alvsan09@xxxxxxxxx> wrote:
Much better now,  
I noted several branches in the R4E gitgub repo that are already merged to others, shall these be cleaned up to avoid confusion ?

/Alvaro 


On Tue, Oct 2, 2012 at 5:49 PM, Miles Parker <s @tasktop.com> wrote:
I just meant that I thought that the repos wasn't set up to allow FF or force, but it is. :) It's all set now.

On 2012-10-02, at 12:45 PM, Alvaro Sanchez <alvsan09@xxxxxxxxx> wrote:

> Since you want to update HEAD in the remote repository you will have to do it in two steps, after crating a branch from you local master (very important to save your changes)
>
>   a) reset master to the desired commit either by command e.g. git reset commit --hard
>        or e.g. using Egit History view select the commit and from the context menu choose reset Hard (this will clean changes, index, etc) so it's important to have previously created a branch from master.
>
>   b)  while on master push your new reset master to github using the option -f force
>        e.g. > git push -f
>
> Now your local and remote master shall be pointing to a commit common to eclipse.org and github where we can receive updates to rebase the integration work
>
> /Alvaro
>
>
> On Tue, Oct 2, 2012 at 3:06 PM, Miles Parker <miles.parker@xxxxxxxxxxx> wrote:
>
> Hmm…I don't think you can do that w/ no-fast forward, but I'd like to be wrong. What's the git to try that? In any case, I think we'll be better off ignoring master there.
>
> On 2012-10-02, at 12:02 PM, Alvaro Sanchez <alvsan09@xxxxxxxxx> wrote:
>
> > 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
> >
> > _______________________________________________
> > 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

_______________________________________________
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



Back to the top