[petsc-users] make dist + hg

[Satish Balay]

On Tue, 15 Jan 2013, Jed Brown wrote:

> On Tue, Jan 15, 2013 at 3:40 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
> >
> > Why not commit your changes, and always do 'hg pull --rebase' to get
> > latest petsc-dev stuff?
> >
> > Also - for uncommited stuff - I would get a patchfile with 'hg diff'
> > and apply it to the remote source tree.
> 
> 
> I would keep an hg clone on each machine. Then you can push and pull your
> changes. I'd put all your changes in a bookmark that you can rebase. Note
> that when you rebase, you'll get new commits when you pull from one of the
> other machines, and you should get rid of the old patches.

How does one get rid of the 'old patches' in this workflow?

Satish

> (You can also
> merge each time, but then you get lots of merge commits that don't really
> mean anything; and it's harder to send your patches upstream because the
> merge commits end up in the wrong place.)