Mercurial > hg

comparison tests/test-subrepo-recursion.t @ 12175:c0a8f9dea0f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepos: handle modified but uncommitted .hgsub
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Sep 2010 16:23:55 +0200
parents d2c5b0927c28
children 166b9866580a
comparison
equal deleted inserted replaced
12174:7bccd04292a2 12175:c0a8f9dea0f6
25 $ hg add .hgsub 25 $ hg add .hgsub
26 26
27 $ cd .. 27 $ cd ..
28 $ echo 'foo = foo' > .hgsub 28 $ echo 'foo = foo' > .hgsub
29 $ hg add .hgsub 29 $ hg add .hgsub
30
31 Test recursive status without committing anything:
32
33 $ hg status
34 A .hgsub
35 A foo/.hgsub
36 A foo/bar/z.txt
37 A foo/y.txt
38 A x.txt
39
40 Test recursive diff without committing anything:
41
42 $ hg diff foo
43 diff -r 000000000000 foo/.hgsub
44 --- /dev/null
45 +++ b/foo/.hgsub
46 @@ -0,0 +1,1 @@
47 +bar = bar
48 diff -r 000000000000 foo/y.txt
49 --- /dev/null
50 +++ b/foo/y.txt
51 @@ -0,0 +1,1 @@
52 +y1
53 diff -r 000000000000 foo/bar/z.txt
54 --- /dev/null
55 +++ b/foo/bar/z.txt
56 @@ -0,0 +1,1 @@
57 +z1
58
59 Commits:
30 60
31 $ hg commit -m 0-0-0 61 $ hg commit -m 0-0-0
32 committing subrepository foo 62 committing subrepository foo
33 committing subrepository foo/bar 63 committing subrepository foo/bar
34 64