tests/test-copy.out
author Bernhard Leiner <bleiner@gmail.com>
Sat, 02 Aug 2008 22:10:10 +0200
changeset 6858 8f256bf98219
parent 3853 c0b449154a90
child 6932 d557749c627a
permissions -rw-r--r--
Add support for multiple possible bisect results (issue1228, issue1182) The real reason for both issue is that bisect can not handle cases where there are multiple possibilities for the result. Example (from issue1228): rev 0 -> good rev 1 -> skipped rev 2 -> skipped rev 3 -> skipped rev 4 -> bad Note that this patch does not only fix the reported Assertion Error but also the problem of a non converging bisect: hg init for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done hg bisect -b 2 hg bisect -g 0 hg bisect -s From this state on, you can: a) mark as bad forever (non converging!) b) mark as good to get an inconsistent state c) skip for the Assertion Error Minor description and code edits by pmezard.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     1
A b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     2
b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
     3
 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     4
we should see two history entries
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2223
diff changeset
     5
changeset:   1:386a3cc01532
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     6
tag:         tip
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     7
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
     8
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     9
files:       b
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    10
description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    11
2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    12
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    13
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2223
diff changeset
    14
changeset:   0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    15
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
    16
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    17
files:       a
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    18
description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    19
1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    20
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    21
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    22
we should see one log entry for a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
    23
changeset:   0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    24
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
    25
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    26
summary:     1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    27
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    28
this should show a revision linked to changeset 0
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    29
   rev    offset  length   base linkrev nodeid       p1           p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    30
     0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    31
we should see one log entry for b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
    32
changeset:   1:386a3cc01532
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
    33
tag:         tip
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    34
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
    35
date:        Mon Jan 12 13:46:40 1970 +0000
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    36
summary:     2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    37
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    38
this should show a revision linked to changeset 1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    39
   rev    offset  length   base linkrev nodeid       p1           p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    40
     0         0      65      0       1 9a263dd772e0 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    41
this should show the rename information in the metadata
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    42
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    43
copy: a
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2966
diff changeset
    44
ed156f22f0a6fde642de0b5eba0cbbb2  .hg/store/data/b.i
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
    45
60b725f10c9c85c70d97880dfe8191b3  bsum
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
    46
60b725f10c9c85c70d97880dfe8191b3  asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    47
checking changesets
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    48
checking manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    49
crosschecking files in changesets and manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    50
checking files
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    51
2 files, 2 changesets, 2 total revisions