[petsc-dev] Merge sets

[Barry Smith]

On Feb 18, 2012, at 3:18 PM, Matthew Knepley wrote:

> I have lost the BB battle, however can we at least start using
> 
>   hg pull --rebase
> 
> so that we avoid this
> 
>   https://bitbucket.org/petsc/petsc-dev/changeset/ad9064ecab66


  1) I don't like the idea of a pull doing anything locally on my machine. I want it to only get the stuff from the remote repository and bring it to my machine. This reeks of svn

  2) If the rebase implementation has been fixed from the hacky versions that fucked unnecessarily with my file system I'll be happy to start using rebase. Is it fixed?

   Barry

> 
>      Matt
> 
> -- 
> What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.
> -- Norbert Wiener