<div dir="ltr">On Tue, Jan 15, 2013 at 3:51 PM, Jed Brown <span dir="ltr"><<a href="mailto:jedbrown@mcs.anl.gov" target="_blank">jedbrown@mcs.anl.gov</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div>On Tue, Jan 15, 2013 at 3:49 PM, Satish Balay <span dir="ltr"><<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>></span> wrote:<br>
<div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">How does one get rid of the 'old patches' in this workflow?</blockquote>
</div><br></div>hg strip</div></div>
</blockquote></div><br></div><div class="gmail_extra">FWIW, when you fetch modified changes with git, you get a note like this</div><div class="gmail_extra"><br></div><div class="gmail_extra"> + b67207b...68aa12d master -> origin/master (forced update)<br>
</div><div class="gmail_extra"><br></div><div class="gmail_extra">and the remote is updated without the user needing to do anything. This also applies if you have refactored the patches, perhaps merging, reordering, or dropping. At that point, you can either "git reset --hard origin" which explicitly sets your local branch to match what you just fetched, or the usual "git rebase" which discards the patches that are effectively present (while rebasing) and keeps any new work you had done in the clone (which is probably nothing in Toby's case).</div>
</div>