[petsc-dev] Merge sets

[Satish Balay]

On Sat, 18 Feb 2012, Barry Smith wrote:

>   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?

The issue is:

>>
When file 'a.c' is locally commited, and a pull potentially has
changes to 'b.c', 'pull --rebase' also changes the timestamp on a.c
[whereas 'pull; merge; commit' does not change timestamp on a.c]
<<

Latest hg [version 2.1] still updates the timestamp of a.c on rebase.

Rebase is doing state changes [wrt commit states] - in this process I
think removes local changesets and recommits them - so the locally
changed files get new timestamps in this process.

The fact that 'make' relies on timestamps messes things up [causing
unnecessary recompiles]. Reseting timestamps on unchanged files would
be a good optimziation - which is what Barry wants..

Satish