tests/test-copy.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6935 03916abdfb64
child 10490 f2618cacb485
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
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
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
     4
committed changeset 1:386a3cc01532710ca78aed9a54fa2f459c04f29c
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     5
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
     6
changeset:   1:386a3cc01532
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     7
tag:         tip
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
     8
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
     9
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    10
files:       b
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    11
description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    12
2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    13
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    14
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2223
diff changeset
    15
changeset:   0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    16
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
    17
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    18
files:       a
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    19
description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    20
1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    21
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    22
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    23
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
    24
changeset:   0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    25
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
    26
date:        Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    27
summary:     1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    28
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    29
this should show a revision linked to changeset 0
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    30
   rev    offset  length   base linkrev nodeid       p1           p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    31
     0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    32
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
    33
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
    34
tag:         tip
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    35
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
    36
date:        Mon Jan 12 13:46:40 1970 +0000
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    37
summary:     2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    38
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    39
this should show a revision linked to changeset 1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    40
   rev    offset  length   base linkrev nodeid       p1           p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    41
     0         0      65      0       1 9a263dd772e0 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    42
this should show the rename information in the metadata
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    43
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
    44
copy: a
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2966
diff changeset
    45
ed156f22f0a6fde642de0b5eba0cbbb2  .hg/store/data/b.i
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
    46
60b725f10c9c85c70d97880dfe8191b3  bsum
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
    47
60b725f10c9c85c70d97880dfe8191b3  asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    48
checking changesets
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    49
checking manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    50
crosschecking files in changesets and manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    51
checking files
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
    52
2 files, 2 changesets, 2 total revisions