tests/test-copy
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 3853 c0b449154a90
permissions -rwxr-xr-x
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 464
diff changeset
     1
#!/bin/sh
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     3
hg init
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     4
echo a > a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     5
hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
     6
hg commit -m "1" -d "1000000 0"
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     7
hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     8
hg copy a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     9
hg status
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
    10
hg --debug commit -m "2" -d "1000000 0"
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    11
echo "we should see two history entries"
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    12
hg history -v
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    13
echo "we should see one log entry for a"
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    14
hg log a
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    15
echo "this should show a revision linked to changeset 0"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
    16
hg debugindex .hg/store/data/a.i
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    17
echo "we should see one log entry for b"
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    18
hg log b
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    19
echo "this should show a revision linked to changeset 1"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
    20
hg debugindex .hg/store/data/b.i
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    21
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    22
echo "this should show the rename information in the metadata"
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
    23
hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 814
diff changeset
    24
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2223
diff changeset
    25
$TESTDIR/md5sum.py .hg/store/data/b.i
462
512d76558bd4 Fix pipe timing for copy test
mpm@selenic.com
parents: 363
diff changeset
    26
hg cat b > bsum
1923
7d83a351a936 fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents: 1252
diff changeset
    27
$TESTDIR/md5sum.py bsum
462
512d76558bd4 Fix pipe timing for copy test
mpm@selenic.com
parents: 363
diff changeset
    28
hg cat a > asum
1923
7d83a351a936 fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents: 1252
diff changeset
    29
$TESTDIR/md5sum.py asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    30
hg verify