tests/test-issue322
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 17 Dec 2006 05:00:22 +0100
changeset 3923 27230c29bfec
parent 2953 3d5547845158
child 3988 9dcf9d45cab8
permissions -rwxr-xr-x
fix calculation of new heads added during push with -r fix issue450
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2946
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     1
#!/bin/sh
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     2
# http://www.selenic.com/mercurial/bts/issue322
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     3
2949
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
     4
echo % file replaced with directory
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
     5
2946
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     6
hg init a
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     7
cd a       
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     8
echo a > a 
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     9
hg commit -Ama 
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    10
rm a       
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    11
mkdir a    
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    12
echo a > a/a
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    13
2949
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    14
echo % should fail - would corrupt dirstate
2946
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    15
hg add a/a
2949
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    16
2946
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    17
cd ..      
a7a9ba7a9f48 add test for issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    18
2949
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    19
echo % directory replaced with file
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    20
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    21
hg init c
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    22
cd c
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    23
mkdir a
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    24
echo a > a/a
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    25
hg commit -Ama
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    26
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    27
rm -rf a
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    28
echo a > a
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    29
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    30
echo % should fail - would corrupt dirstate
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    31
hg add a
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    32
2953
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    33
cd ..
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    34
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    35
echo % directory replaced with file
2949
7356fa3cff2c add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2946
diff changeset
    36
2953
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    37
hg init d
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    38
cd d
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    39
mkdir b
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    40
mkdir b/c
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    41
echo a > b/c/d
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    42
hg commit -Ama
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    43
rm -rf b
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    44
echo a > b
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    45
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    46
echo % should fail - would corrupt dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    47
hg add b
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    48
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2949
diff changeset
    49
exit 0