tests/test-merge6
author Matt Mackall <mpm@selenic.com>
Sun, 10 Jul 2005 16:13:39 -0800
changeset 670 4efb9b109292
parent 619 d96c1153b25d
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Move .hg into ignore()
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     1
#!/bin/sh -x
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     3
cat <<'EOF' > merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     4
#!/bin/sh
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     5
echo merging for `basename $1`
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     6
EOF
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     7
chmod +x merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     8
export HGMERGE=./merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     9
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    10
mkdir A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    11
cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    12
hg init
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    13
echo This is file foo1 > foo
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    14
echo This is file bar1 > bar
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    15
hg add foo bar
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    16
hg commit -t "commit text" -d "0 0" -u user
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    17
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    18
cd ..
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    19
hg clone A1 B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    20
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    21
cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    22
rm bar
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    23
hg remove bar
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    24
hg commit -t "commit test" -d "0 0" -u user
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    25
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    26
cd ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    27
echo This is file foo22 > foo
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    28
hg commit -t "commit test" -d "0 0" -u user
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    29
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    30
cd ..
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    31
hg clone A1 A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    32
hg clone B1 B2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    33
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    34
cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    35
hg pull ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    36
hg update -m
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    37
hg commit -t "commit test" -d "0 0" -u user
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    38
echo bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    39
hg manifest
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    40
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    41
cd ../B2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    42
hg pull ../A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    43
hg update -m
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    44
hg commit -t "commit test" -d "0 0" -u user
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    45
echo bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    46
hg manifest