tests/test-revlog-group-emptyiter
author Stuart W Marks <smarks@smarks.org>
Thu, 05 Nov 2009 10:53:36 +0100
changeset 9716 ea8c207a0f78
parent 8635 aaaf4af1c173
permissions -rwxr-xr-x
update: add comments and test cases for updating across branches Add comment to merge.py:update() showing various cases of 'hg update': to a descendant, crossing named branches, and crossing branches within a named branch; with no option, -c or -C; with or without uncommitted changes; and with or without a specific revision. Add tests for all of these cases.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     1
#! /bin/sh
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     2
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     3
# issue 1678
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     4
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     5
echo "# -- setting up base repo"
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     6
hg init a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     7
cd a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     8
touch a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     9
hg ci -Am a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    10
cd ..
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    11
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    12
echo "# -- cloning base repo"
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    13
hg clone a b
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    14
cd b
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    15
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    16
echo "# -- setting up cset to push"
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    17
hg up null
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    18
touch a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    19
hg ci -Am b # different msg so we get a clog new entry
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    20
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    21
echo "# -- pushing"
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    22
hg push -f ../a
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    23