tests/test-update-reverse
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 1933 7544700fd931
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     2
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     3
hg init
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     4
touch a
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     5
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: 1443
diff changeset
     6
hg commit -m "Added a" -d "1000000 0"
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     7
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     8
touch main
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     9
hg add main
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1443
diff changeset
    10
hg commit -m "Added main" -d "1000000 0"
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    11
hg checkout 0
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    12
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    13
echo Main should be gone
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    14
ls
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    15
1308
2073e5a71008 Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1236
diff changeset
    16
touch side1
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    17
hg add side1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1443
diff changeset
    18
hg commit -m "Added side1" -d "1000000 0"
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    19
touch side2
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    20
hg add side2
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1443
diff changeset
    21
hg commit -m "Added side2" -d "1000000 0"
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    22
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    23
hg log
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    24
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    25
echo Should have two heads, side2 and main
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    26
hg heads
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    27
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    28
echo Should show "a side1 side2"
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    29
ls
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    30
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    31
hg update --debug -C 1
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    32
echo Should only show "a main"
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    33
ls
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    34