[Paraview-developers] Dashboard question

[Andy Bauer]

I agree with John on this one.  Well, for locally rebasing anyways.  If I
were better at using the stash I'd never have cruft going in.  There's no
need for people to see how many print statements make it into my code :)
Maybe Ken was referring to rebasing changes that already got pushed to next.


On Fri, Mar 2, 2012 at 10:13 AM, Biddiscombe, John A. <biddisco at cscs.ch>wrote:

> Understood.
>
> Does that not mean that master grows ever-more crufty with all the small
> commits too, or are they somehow squashed into single commits during the
> merge to master.
>
> PS. Ken. FAIL! Rebasing is very sexy and I like it lots. I can take months
> of rubbish coding and turn it into a nice clean commit with a simple
> explanation instead of hundreds of hard to unravel mini-mistakes. After I'm
> dead and gone, people with truly think that I never made any coding
> mistakes :)
>
> JB
>
> -----Original Message-----
> From: Kyle Lutz [mailto:kyle.lutz at kitware.com]
> Sent: 02 March 2012 16:08
> To: Biddiscombe, John A.
> Cc: paraview-developers at paraview.org
> Subject: Re: [Paraview-developers] Dashboard question
>
> On Fri, Mar 2, 2012 at 10:01 AM, Biddiscombe, John A. <biddisco at cscs.ch>
> wrote:
> > Kyle,
> >
> > Thanks
> >
> >>
> > There is no way to un-merge but you can revert your commit and merge
> that into next.
> > <
> >
> > Does that mean that next is continually growing with commits and
> reverted commits and if you merged a huge load of stuff by mistake, you
> can't reset next back to the point before you added a lot of commits to
> clean it up.
> >
> > My hypothetical use case was that you merge to next, but get some
> unexpected problems, so you end up doing a whole bunch of small commits to
> fix the issues, afterwards you want to rebase all those branch commits into
> a single clean commit and merge that to next instead of all the duff ones.
> >
> > Am I to understand that that's not possible in quite the way I imagined.
> If not, then I'll be extra careful about stage merge.
>
> Periodically we do cleanup paraview-next by removing all the topics and
> resetting it to paraview-master.
>
> No need to be *extra* careful, as long as it didn't get merged to master
> there is no real harm done.
>
> -kyle
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20120302/f7505d52/attachment-0001.htm>