tests/test-up-local-change
author mpm@selenic.com
Sun, 26 Jun 2005 15:20:46 -0800
changeset 485 c5705ab9cebd
parent 350 b4e0e20646bb
child 544 3d4d5f2aba9a
child 547 4fc63e22b1fe
permissions -rwxr-xr-x
[PATCH] add clone command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] add clone command Add clone command. Mark with-source version of "init" as deprecated. manifest hash: 3c31263474977c3d8303f45f71c44f7b7e10e97e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvzhOywK+sNU5EO8RAmh+AJwIlRfX143oxKShgPWF2dbDvCuH3gCbBrAW isIHptwVRX8pcA0lU638pHo= =ZoQy -----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
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
    13
hg clone . ../r2
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
    14
cd ../r2
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    15
hg up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    16
echo abc > a
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    17
hg diff > ../d
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    18
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    19
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    20
cd ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    21
echo b > b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    22
echo a2 > a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    23
hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
hg commit -t "2" -u test -d "0 0"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    26
cd ../r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    27
hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    28
hg status
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    29
hg -d up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    30
hg -d up -m
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    31
hg parents
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    32
hg -v history
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    33
hg diff > ../d
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    34
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    35