Hi,
Juan Fuentes --> dwm (2006-08-03 12:43:05 -0400):
> Actually Jukka it seems you are running diff backwards, you are doing:
>
> diff -u client.c client.c.orig
>
> It should be:
>
> diff -u client.c.orig client.c
No. When doing a `hg diff client.c', the original is compared to the
locally changed version as if you'd run
$ hg revert client.c
$ diff -u client.c client.c.orig
because client.c is the original version, and client.c.orig is the
locally changed one. OK, I admit the names are a little confusing here
;-)
> And you will basically get a similar output to hg diff. I know in
> the linux kernel this happens a lot when done manually, that's
> why now they prefer people use git diff.
Linux? Never heard... ;-)
Cheers, Jukka
-- bashian roulette: $ ((RANDOM%6)) || rm -rf ~Received on Thu Aug 03 2006 - 18:57:04 UTC
This archive was generated by hypermail 2.2.0 : Sun Jul 13 2008 - 14:29:54 UTC