[petsc-users] make dist + hg

[Jed Brown]

On Tue, Jan 15, 2013 at 3:51 PM, Jed Brown <jedbrown at mcs.anl.gov> wrote:

> On Tue, Jan 15, 2013 at 3:49 PM, Satish Balay <balay at mcs.anl.gov> wrote:
>
>> How does one get rid of the 'old patches' in this workflow?
>
>
> hg strip
>

FWIW, when you fetch modified changes with git, you get a note like this

 + b67207b...68aa12d master     -> origin/master  (forced update)

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).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-users/attachments/20130115/8713b125/attachment-0001.html>