Mercurial > hg

annotate tests/test-diff-hashes.t @ 12137:e1814ff260c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-diff-hashes
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 30 Aug 2010 16:52:21 +0200
parents tests/test-diff-hashes@c2d0ed7f4af8
children 4c94b6d0fb1c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
1 $ hg init a
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
2 $ cd a
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
3
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
4 $ hg diff inexistent1 inexistent2
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
5 inexistent1: No such file or directory
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
6 inexistent2: No such file or directory
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
7
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
8 $ echo bar > foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
9 $ hg add foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
10 $ hg ci -m 'add foo' -d '1000000 0'
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
11
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
12 $ echo foobar > foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
13 $ hg ci -m 'change foo' -d '1000001 0'
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
14
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
15 $ hg --quiet diff -r 0 -r 1
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
16 --- a/foo Mon Jan 12 13:46:40 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
17 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
18 @@ -1,1 +1,1 @@
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
19 -bar
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
20 +foobar
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
21
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
22 $ hg diff -r 0 -r 1
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
23 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
24 --- a/foo Mon Jan 12 13:46:40 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
25 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
26 @@ -1,1 +1,1 @@
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
27 -bar
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
28 +foobar
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
29
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
30 $ hg --verbose diff -r 0 -r 1
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
31 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
32 --- a/foo Mon Jan 12 13:46:40 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
33 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
34 @@ -1,1 +1,1 @@
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
35 -bar
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
36 +foobar
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
37
12137
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
38 $ hg --debug diff -r 0 -r 1
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
39 diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
40 --- a/foo Mon Jan 12 13:46:40 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
41 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
42 @@ -1,1 +1,1 @@
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
43 -bar
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
44 +foobar
e1814ff260c2 tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com>
parents: 5689
diff changeset
45