tests/test-issue322
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 29 Dec 2007 17:11:48 +0300
changeset 5811 180a3eee4b75
parent 4659 7a7d4937272b
child 8936 1de6e7e1bb9f
permissions -rwxr-xr-x
Fix copies reporting in log and convert. If copy logged in file revision, we report copy for changeset only if file revisions linkrev points back to the changeset in question or both changeset parents contain different file revisions. This fixes extra copies reported when executable bit was changed for previously copied file.
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
4659
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
     7
cd a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
     8
echo a > a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
     9
hg commit -Ama
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
    10
rm a
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
    11
mkdir a
2946
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
4659
7a7d4937272b Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3988
diff changeset
    17
cd ..
2946
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
3988
9dcf9d45cab8 Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2953
diff changeset
    27
rm -r a
2949
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
3988
9dcf9d45cab8 Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2953
diff changeset
    43
rm -r b
2953
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