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.<br>
<br><br><div class="gmail_quote">On Fri, Mar 2, 2012 at 10:13 AM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch">biddisco@cscs.ch</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Understood.<br>
<br>
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.<br>
<br>
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 :)<br>
<br>
JB<br>
<div class="HOEnZb"><div class="h5"><br>
-----Original Message-----<br>
From: Kyle Lutz [mailto:<a href="mailto:kyle.lutz@kitware.com">kyle.lutz@kitware.com</a>]<br>
Sent: 02 March 2012 16:08<br>
To: Biddiscombe, John A.<br>
Cc: <a href="mailto:paraview-developers@paraview.org">paraview-developers@paraview.org</a><br>
Subject: Re: [Paraview-developers] Dashboard question<br>
<br>
On Fri, Mar 2, 2012 at 10:01 AM, Biddiscombe, John A. <<a href="mailto:biddisco@cscs.ch">biddisco@cscs.ch</a>> wrote:<br>
> Kyle,<br>
><br>
> Thanks<br>
><br>
>><br>
> There is no way to un-merge but you can revert your commit and merge that into next.<br>
> <<br>
><br>
> 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.<br>
><br>
> 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.<br>
><br>
> 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.<br>
<br>
Periodically we do cleanup paraview-next by removing all the topics and resetting it to paraview-master.<br>
<br>
No need to be *extra* careful, as long as it didn't get merged to master there is no real harm done.<br>
<br>
-kyle<br>
_______________________________________________<br>
Paraview-developers mailing list<br>
<a href="mailto:Paraview-developers@paraview.org">Paraview-developers@paraview.org</a><br>
<a href="http://public.kitware.com/mailman/listinfo/paraview-developers" target="_blank">http://public.kitware.com/mailman/listinfo/paraview-developers</a><br>
</div></div></blockquote></div><br>