Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-basic.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     3
 
+ hg commit -m test -d 0 0
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg history
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 761
diff changeset 
     5
 
changeset:   0:acb14030fe0a
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset 
     6
 
tag:         tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     7
 
user:        test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset 
     8
 
date:        Thu Jan  1 00:00:00 1970
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     9
 
summary:     test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    10
 












55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    11


+ hg manifest













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    12


b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    13


+ hg cat a













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    14


a













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    15


+ hg verify













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    16


checking changesets













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    17


checking manifests













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    18


crosschecking files in changesets and manifests













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    19


checking files













55f63f3b6a54
Add a simple testing framework



mpm@selenic.com


parents: 

diff
changeset




    20


1 files, 1 changesets, 1 total revisions















mercurial-crew-with-dirclash