tests/test-rawcommit1
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 29 Mar 2006 10:27:16 -0800
changeset 2019 ced2d3620f95
parent 1933 7544700fd931
child 3375 9fe62e2db71d
permissions -rwxr-xr-x
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
     1
#!/bin/sh
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     2
hg --debug init
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     3
echo this is a1 > a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     4
hg add a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
     5
hg commit -m0 -d "1000000 0"
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     6
echo this is b1 > b
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     7
hg add b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
     8
hg commit -m1 -d "1000000 0"
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     9
hg manifest 1
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    10
echo this is c1 > c
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    11
hg rawcommit -p 1 -d "1000000 0" -m2 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    12
hg manifest 2
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    13
hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    14
rm b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    15
hg rawcommit -p 2 -d "1000000 0" -m3 b
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    16
hg manifest 3
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    17
hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    18
echo this is a22 > a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    19
hg rawcommit -p 3 -d "1000000 0" -m4 a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    20
hg manifest 4
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    21
hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    22
echo this is c22 > c
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    23
hg rawcommit -p 1 -d "1000000 0" -m5 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    24
hg manifest 5
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    25
hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    26
# merge, but no files changed
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    27
hg rawcommit -p 4 -p 5 -d "1000000 0" -m6
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    28
hg manifest 6
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    29
hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    30
# no changes what-so-ever
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    31
hg rawcommit -p 6 -d "1000000 0" -m7
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    32
hg manifest 7
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
    33
hg parents