tests/test-clone-r.out
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Wed, 18 Nov 2009 12:47:58 +0100
changeset 9881 54b518fc6671
parent 9611 a3d73b3e1f8a
child 10490 f2618cacb485
permissions -rw-r--r--
httprepo: suppress the `real URL is...' message in safe, common cases. When the actual and requested URL only differ by trailing slashes, there is no need to warn. As an example, this easily happens when accessing repositories on Bitbucket over HTTP(S). As far as I could tell, there were no existing tests for this behaviour.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
     1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 2175
diff changeset
     2
created new head
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
     3
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     4
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     5
     0         0       3      0       0 362fef284ce2 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     6
     1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     7
     2         8       7      2       2 4c982badb186 125144f7e028 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     8
     3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     9
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    10
     0         0      75      0       7 905359268f77 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    11
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    12
     0         0      75      0       8 905359268f77 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    13
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    14
     0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    15
   rev    offset  length   base linkrev nodeid       p1           p2
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    16
     0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    17
     1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    18
     2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    19
     3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    20
     4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    21
     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    22
     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    23
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    24
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    25
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    26
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    27
4 files, 9 changesets, 7 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    28
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    29
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    30
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    31
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    32
added 1 changesets with 1 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    33
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    34
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    35
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    36
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    37
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    38
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    39
1 files, 1 changesets, 1 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    40
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    41
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    42
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    43
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    44
added 2 changesets with 2 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    45
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    46
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    47
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    48
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    49
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    50
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    51
1 files, 2 changesets, 2 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    52
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    53
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    54
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    55
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    56
added 3 changesets with 3 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    57
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    58
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    59
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    60
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    61
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    62
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    63
1 files, 3 changesets, 3 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    64
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    65
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    66
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    67
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    68
added 4 changesets with 4 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    69
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    70
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    71
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    72
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    73
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    74
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    75
1 files, 4 changesets, 4 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    76
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    77
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    78
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    79
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    80
added 2 changesets with 2 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    81
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    82
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    83
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    84
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    85
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    86
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    87
1 files, 2 changesets, 2 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    88
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    89
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    90
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    91
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    92
added 3 changesets with 3 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
    93
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    94
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    95
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    96
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    97
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    98
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    99
1 files, 3 changesets, 3 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   100
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   101
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   102
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   103
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   104
added 4 changesets with 5 changes to 2 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
   105
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
   106
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   107
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   108
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   109
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   110
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   111
2 files, 4 changesets, 5 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   112
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   113
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   114
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   115
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   116
added 5 changesets with 6 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
   117
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
   118
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   119
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   120
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   121
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   122
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   123
3 files, 5 changesets, 6 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   124
requesting all changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   125
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   126
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   127
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   128
added 5 changesets with 5 changes to 2 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
   129
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
   130
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1468
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   131
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   132
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   133
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   134
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   135
2 files, 5 changesets, 5 total revisions
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   136
pulling from ../test-7
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   137
searching for changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   138
adding changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   139
adding manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   140
adding file changes
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   141
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
   142
(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
   143
checking changesets
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   144
checking manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   145
crosschecking files in changesets and manifests
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   146
checking files
dc1bbc456b96 Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   147
4 files, 9 changesets, 7 total revisions