tests/test-clone-r.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 29 Mar 2006 22:35:21 +0200
changeset 2021 fc22ed56afe3
parent 2019 ced2d3620f95
child 2143 3053fc33f545
permissions -rw-r--r--
Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     1
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     2
     0         0       3      0       0 362fef284ce2 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     3
     1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     4
     2         8       7      2       2 4c982badb186 125144f7e028 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     5
     3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     6
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     7
     0         0      75      0       7 905359268f77 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     8
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     9
     0         0      75      0       8 905359268f77 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    10
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    11
     0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    12
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    13
     0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    14
     1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    15
     2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    16
     3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    17
     4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    18
     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    19
     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    20
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    21
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    22
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    23
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    24
4 files, 9 changesets, 7 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    25
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    26
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    27
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    28
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    29
added 1 changesets with 1 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    30
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    31
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    32
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    33
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    34
1 files, 1 changesets, 1 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    35
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    36
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    37
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    38
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    39
added 2 changesets with 2 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    40
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    41
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    42
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    43
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    44
1 files, 2 changesets, 2 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    45
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    46
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    47
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    48
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    49
added 3 changesets with 3 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    50
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    51
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    52
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    53
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    54
1 files, 3 changesets, 3 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    55
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    56
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    57
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    58
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    59
added 4 changesets with 4 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    60
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    61
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    62
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    63
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    64
1 files, 4 changesets, 4 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    65
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    66
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    67
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    68
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    69
added 2 changesets with 2 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    70
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    71
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    72
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    73
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    74
1 files, 2 changesets, 2 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    75
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    76
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    77
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    78
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    79
added 3 changesets with 3 changes to 1 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    80
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    81
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    82
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    83
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    84
1 files, 3 changesets, 3 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    85
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    86
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    87
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    88
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    89
added 4 changesets with 5 changes to 2 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    90
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    91
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    92
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    93
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    94
2 files, 4 changesets, 5 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    95
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    96
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    97
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    98
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    99
added 5 changesets with 6 changes to 3 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   100
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   101
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   102
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   103
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   104
3 files, 5 changesets, 6 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   105
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   106
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   107
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   108
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   109
added 5 changesets with 5 changes to 2 files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   110
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   111
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   112
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   113
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   114
2 files, 5 changesets, 5 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   115
pulling from ../test-7
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   116
searching for changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   117
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   118
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   119
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   120
added 4 changesets with 2 changes to 3 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1468
diff changeset
   121
(run 'hg heads' to see heads, 'hg merge' to merge)
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   122
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   123
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   124
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   125
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   126
4 files, 9 changesets, 7 total revisions