tests/test-branch
author Patrick Mezard <pmezard@gmail.com>
Sat, 19 May 2007 22:46:59 +0200
changeset 4443 4e521a3ee5eb
parent 3068 547d1a4aa105
permissions -rwxr-xr-x
Test issue 562: .hgignore requires newline at end
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3068
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     1
#!/bin/sh
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     2
#
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     3
# test for branch handling
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     4
#
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     5
# XXX: need more tests
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     6
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     7
hg init
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     8
echo a > a
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
     9
echo b > b
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    10
hg ci -A -m 0 -d "1000000 0"
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    11
echo aa > a
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    12
echo bb > b
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    13
hg ci -m 1 -d "1000000 0"
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    14
hg tag -l foo
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    15
hg update 0
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    16
hg parents -b 
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    17
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    18
# test update
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    19
hg update -b foo
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    20
hg parents
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    21
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    22
# test merge
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    23
hg update 0
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    24
echo c > c
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    25
hg ci -A -m 0.0 -d "1000000 0"
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    26
hg merge -b foo
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    27
hg parents -b 
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    28
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    29
# re-test with more branches
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    30
hg update -C 0
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    31
echo d > d
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    32
hg ci -A -m 0.0 -d "1000000 0"
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    33
hg merge -b foo
547d1a4aa105 hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
    34
hg parents -b