annotate tests/test-merge-closedheads @ 11835:14db59e3b248 stable

convert: Test svn sink for a repo with tags. This test case backs the fix in changeset 7e5f5e5858f9. The subversion sink used to crash, if the source repo used tags.
author Daniel J. Lauk <daniel.lauk@gmail.com>
date Thu, 12 Aug 2010 11:15:33 +0200
parents ee876e42dd74
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8694
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
1 #!/bin/sh
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
2
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
3 hgcommit() {
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
4 hg commit -u user -d '0 0' "$@"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
5 }
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
6
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
7 hg init clhead
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
8 cd clhead
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
9
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
10
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
11 touch foo && hg add && hgcommit -m 'foo'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
12 touch bar && hg add && hgcommit -m 'bar'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
13 touch baz && hg add && hgcommit -m 'baz'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
14
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
15 echo "flub" > foo
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
16 hgcommit -m "flub"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
17 echo "nub" > foo
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
18 hgcommit -m "nub"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
19
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
20 hg up -C 2
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
21
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
22 echo "c1" > c1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
23 hg add c1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
24 hgcommit -m "c1"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
25 echo "c2" > c1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
26 hgcommit -m "c2"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
27
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
28 hg up -C 2
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
29
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
30 echo "d1" > d1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
31 hg add d1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
32 hgcommit -m "d1"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
33 echo "d2" > d1
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
34 hgcommit -m "d2"
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
35 hg tag -l good
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
36
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
37 echo '% fail with three heads'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
38 hg up -C good
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
39 hg merge
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
40
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
41 echo '% close one of the heads'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
42 hg up -C 6
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
43 hgcommit -m 'close this head' --close-branch
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
44
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
45 echo '% succeed with two open heads'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
46 hg up -C good
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
47 hg up -C good
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
48 hg merge
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
49 hgcommit -m 'merged heads'
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
50
11516
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
51 echo '% hg update -C 8'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
52 hg update -C 8
8694
ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
diff changeset
53
11516
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
54 echo '% hg branch some-branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
55 hg branch some-branch
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
56 echo '% hg commit'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
57 hgcommit -m 'started some-branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
58 echo '% hg commit --close-branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
59 hgcommit --close-branch -m 'closed some-branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
60
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
61 echo '% hg update default'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
62 hg update default
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
63 echo '% hg merge some-branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
64 hg merge some-branch
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
65 echo '% hg commit (no reopening of some-branch)'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
66 hgcommit -m 'merge with closed branch'
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
67
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
68 cat >> $HGRCPATH <<EOF
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
69 [extensions]
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
70 graphlog =
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
71 EOF
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
72
ee876e42dd74 test-merge-closedheads: test cc982ff2dcf8
Martin Geisler <mg@aragost.com>
parents: 8694
diff changeset
73 #hg glog