tests/test-up-local-change
author mpm@selenic.com
Wed, 15 Jun 2005 00:33:57 -0800
changeset 350 b4e0e20646bb
parent 332 6c869059beb4
parent 349 b2293093b89e
child 485 c5705ab9cebd
permissions -rwxr-xr-x
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: ec82cc2d7b7357fd7db4917e09d7d6865482de58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+f1ywK+sNU5EO8RAuPtAJ0WilDBo3iG4S/dmIabhzYW987TtgCgkjkM 8OmatsrjG01iJAhkKJj+XnQ= =mOLr -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/bash
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     3
export HGMERGE=true
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     4
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     5
set -ex
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     6
mkdir r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     7
cd r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     8
hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
echo a > a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    11
hg commit -t "1" -u test -d "0 0"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    13
cd ..
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    14
mkdir r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    15
cd r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    16
hg init ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    17
hg up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    18
echo abc > a
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    19
hg diff > ../d
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    20
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    21
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    22
cd ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    23
echo b > b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
echo a2 > a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    26
hg commit -t "2" -u test -d "0 0"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    27
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    28
cd ../r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    29
hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    30
hg status
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    31
hg -d up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    32
hg -d up -m
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    33
hg parents
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    34
hg -v history
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    35
hg diff > ../d
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    36
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    37