tests/test-copy.out
author Gilles Moris <gilles.moris@free.fr>
Thu, 21 Feb 2008 08:52:52 +0100
changeset 6161 bc1ba9124799
parent 3853 c0b449154a90
child 6932 d557749c627a
permissions -rw-r--r--
Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout
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