tests/test-simple-update
author Steve Borho <steve@borho.org>
Fri, 17 Sep 2010 12:44:35 -0500
branchstable
changeset 12317 ed639917c825
parent 3736 ad3d5b4367cb
permissions -rwxr-xr-x
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
     1
#!/bin/sh
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
     3
set -e
331
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
mkdir test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     6
cd test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     7
echo foo>foo
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
hg addremove
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 547
diff changeset
    10
hg commit -m "1"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    11
hg verify
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 . ../branch
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
    14
cd ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    15
hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    16
echo bar>>foo
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 547
diff changeset
    17
hg commit -m "2"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    18
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    19
cd ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    20
hg pull ../branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    21
hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    22
hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    23
cat foo
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 814
diff changeset
    24
hg manifest --debug