Mercurial > hg-stable

changeset 3321:455109df3669

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extend test-flags
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 21:48:44 +0200
parents fa59d6763441
children a1aad25ccc3e
files tests/test-flags tests/test-flags.out
diffstat 2 files changed, 67 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-flags	Mon Oct 09 21:22:55 2006 +0200
+++ b/tests/test-flags	Mon Oct 09 21:48:44 2006 +0200
@@ -10,6 +10,7 @@
 hg ci -m "added a b" -d "1000000 0"
 
 cd ..
+hg clone test1 test3
 mkdir test2
 cd test2
 
@@ -29,6 +30,19 @@
 
 hg -v merge
 
-ls -l ../test[12]/a > foo
+cd ../test3
+echo 123 >>b
+hg ci -m "b updated" -d "1000000 0"
+
+hg pull ../test2
+hg heads
+hg history
+
+hg -v merge
+
+ls -l ../test[123]/a > foo
 cut -b 1-10 < foo
 
+hg debugindex .hg/data/a.i
+hg debugindex ../test2/.hg/data/a.i
+hg debugindex ../test1/.hg/data/a.i
--- a/tests/test-flags.out	Mon Oct 09 21:22:55 2006 +0200
+++ b/tests/test-flags.out	Mon Oct 09 21:48:44 2006 +0200
@@ -1,3 +1,4 @@
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test1
 requesting all changes
 adding changesets
@@ -47,5 +48,56 @@
 resolving a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+pulling from ../test2
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+(run 'hg heads' to see heads, 'hg merge' to merge)
+changeset:   2:b833d578451e
+tag:         tip
+parent:      0:4536b1c2ca69
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     chmod +x a
+
+changeset:   1:d54568174d8e
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     b updated
+
+changeset:   2:b833d578451e
+tag:         tip
+parent:      0:4536b1c2ca69
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     chmod +x a
+
+changeset:   1:d54568174d8e
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     b updated
+
+changeset:   0:4536b1c2ca69
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     added a b
+
+resolving manifests
+getting a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 -rwxr-x---
 -rwxr-x---
+-rwxr-x---
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0       0      0       0 b80de5d13875 000000000000 000000000000
+     1         0       0      0       2 37c42bd6cc03 b80de5d13875 000000000000
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0       0      0       0 b80de5d13875 000000000000 000000000000
+     1         0       0      0       1 37c42bd6cc03 b80de5d13875 000000000000
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0       0      0       0 b80de5d13875 000000000000 000000000000
+     1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
+     2         5       0      2       2 37c42bd6cc03 b80de5d13875 000000000000