Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 396:8f8bb77d560e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Changes from the original patch: - - Use 'diff -r ...' instead of 'hg diff -r ...' to support filetype detection by at least file(1) and vim. - - Adjusted tests for this change. - - Some cleanups. manifest hash: 5f37d1ef75ea7f4e48b53f02371053ba54fb70f8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsyZzW7P1GVgWeRoRAqczAJ479lR9Z289sP+VH5L+N7pQRU14SACfUueq 88ABloIR3VyRIa4qbujnZio= =Vva9 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 17 Jun 2005 20:37:23 +0100
parents 398737777644
children c5705ab9cebd
comparison
equal deleted inserted replaced
395:fbe8834923c5 396:8f8bb77d560e
10 + hg init ../r1 10 + hg init ../r1
11 + hg up 11 + hg up
12 + echo abc 12 + echo abc
13 + hg diff 13 + hg diff
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' 14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
15 diff -r c19d34741b0a a
15 --- a/a 16 --- a/a
16 +++ b/a 17 +++ b/a
17 @@ -1,1 +1,1 @@ 18 @@ -1,1 +1,1 @@
18 -a 19 -a
19 +abc 20 +abc
63 description: 64 description:
64 1 65 1
65 66
66 + hg diff 67 + hg diff
67 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' 68 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
69 diff -r 1e71731e6fbb a
68 --- a/a 70 --- a/a
69 +++ b/a 71 +++ b/a
70 @@ -1,1 +1,1 @@ 72 @@ -1,1 +1,1 @@
71 -a2 73 -a2
72 +abc 74 +abc