Re: [petsc-dev] hg diff question
On Mar 23, 2011, at 7:03 PM, Satish Balay wrote:
On Wed, 23 Mar 2011, Barry Smith wrote:
On Mar 23, 2011, at 5:20 PM, Satish Balay wrote:
On Wed, 23 Mar 2011, Satish Balay wrote:
Well this is what I have:
function bsmithdiff { hg diff -c `hg log -l 1 --template '{node}' $1` }
bsmithdiff src/makefile
This one [bash function] is slightly better
function bsmithdiff { hg diff -c `hg log -l $1 --template '{node}\n' $2| tail -1` $2 }
bsmithdiff 1 src/makefile bsmithdiff 2 src/makefile
What good is this? It doesn't show any changes. I want to see the last two sets of changes.
It shows the last 2 changes to src/makefile for me.
Ok, you just sent me nothing so I assumed it showed nothing. Barry
asterix:/home/balay/spetsc>function bsmithdiff {
hg diff -c `hg log -l $1 --template '{node}\n' $2| tail -1` $2 } asterix:/home/balay/spetsc>bsmithdiff 1 src/makefile diff -r 3b37fb452c93 -r 88a383b52fbf src/makefile --- a/src/makefile Wed Mar 23 13:06:49 2011 +0100 +++ b/src/makefile Wed Mar 23 13:49:05 2011 +0100 @@ -1,5 +1,5 @@
-DIRS = inline sys vec mat dm ksp snes ts contrib benchmarks docs tops characteristic +DIRS = inline sys vec mat dm ksp snes ts contrib benchmarks docs tops LOCDIR = src/ MANSEC = Sys
asterix:/home/balay/spetsc>bsmithdiff 2 src/makefile diff -r 2d1785e2f9cd -r 2aec9ed184d1 src/makefile --- a/src/makefile Mon Jun 14 17:32:56 2010 -0500 +++ b/src/makefile Mon Jun 14 17:51:48 2010 -0500 @@ -1,5 +1,5 @@
-DIRS = inline sys vec mat ksp snes ts dm contrib benchmarks docs tops characteristic +DIRS = inline sys vec mat dm ksp snes ts contrib benchmarks docs tops characteristic LOCDIR = src/ MANSEC = Sys
asterix:/home/balay/spetsc>
participants (1)
-
Barry Smith