tests/test-bundle-r.t
author Boris Feld <boris.feld@octobus.net>
Wed, 19 Sep 2018 21:02:47 +0200
changeset 39886 debc4ee597e7
parent 39489 f1186c292d03
child 42110 3a7efcbdf288
permissions -rw-r--r--
revlog: add a callback "tracking" duplicate node addition If a changegroup contains node already added to the repository, they will be skipped. Skipping them is the right behavior (we don't need to store things twice), but it can hide some information to the code doing the unbundle (eg: shelve looking for the tip of the bundle). The first step to improve this situation is to add a low level callback. We do not need this tracking on all revlog, so actual tracking will be added in the next changeset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     1
  $ hg init test
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     2
  $ cd test
16350
4f795f5fbb0b tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15131
diff changeset
     3
  $ hg unbundle "$TESTDIR/bundles/remote.hg"
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
     4
  adding changesets
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
     5
  adding manifests
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
     6
  adding file changes
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
     7
  added 9 changesets with 7 changes to 4 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
     8
  new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
     9
  (run 'hg heads' to see heads, 'hg merge' to merge)
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    10
  $ hg up tip
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    11
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    12
  $ cd ..
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    13
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    14
  $ for i in 0 1 2 3 4 5 6 7 8; do
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    15
  >    mkdir test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    16
  >    hg --cwd test-"$i" init
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    17
  >    hg -R test bundle -r "$i" test-"$i".hg test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    18
  >    cd test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    19
  >    hg unbundle ../test-"$i".hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    20
  >    hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    21
  >    hg tip -q
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    22
  >    cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    23
  > done
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    24
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    25
  1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    26
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    27
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    28
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    29
  added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
    30
  new changesets bfaf4b5cbf01 (1 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    31
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    32
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    33
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    34
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    35
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
    36
  checked 1 changesets with 1 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    37
  0:bfaf4b5cbf01
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    38
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    39
  2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    40
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    41
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    42
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    43
  added 2 changesets with 2 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
    44
  new changesets bfaf4b5cbf01:21f32785131f (2 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    45
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    46
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    47
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    48
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    49
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
    50
  checked 2 changesets with 2 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    51
  1:21f32785131f
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    52
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    53
  3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    54
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    55
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    56
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    57
  added 3 changesets with 3 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
    58
  new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    59
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    60
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    61
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    62
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    63
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
    64
  checked 3 changesets with 3 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    65
  2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    66
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    67
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    68
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    69
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    70
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    71
  added 4 changesets with 4 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
    72
  new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    73
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    74
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    75
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    76
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    77
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
    78
  checked 4 changesets with 4 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    79
  3:93ee6ab32777
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    80
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    81
  2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    82
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    83
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    84
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    85
  added 2 changesets with 2 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
    86
  new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    87
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    88
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    89
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    90
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    91
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
    92
  checked 2 changesets with 2 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
    93
  1:c70afb1ee985
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    94
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    95
  3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    96
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    97
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    98
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    99
  added 3 changesets with 3 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   100
  new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   101
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   102
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   103
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   104
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   105
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   106
  checked 3 changesets with 3 changes to 1 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   107
  2:f03ae5a9b979
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   108
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   109
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   110
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   111
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   112
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   113
  added 4 changesets with 5 changes to 2 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   114
  new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   115
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   116
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   117
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   118
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   119
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   120
  checked 4 changesets with 5 changes to 2 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   121
  3:095cb14b1b4d
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   122
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   123
  5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   124
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   125
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   126
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   127
  added 5 changesets with 6 changes to 3 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   128
  new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   129
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   130
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   131
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   132
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   133
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   134
  checked 5 changesets with 6 changes to 3 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   135
  4:faa2e4234c7a
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   136
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   137
  5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   138
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   139
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   140
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   141
  added 5 changesets with 5 changes to 2 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   142
  new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   143
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   144
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   145
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   146
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   147
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   148
  checked 5 changesets with 5 changes to 2 files
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   149
  4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   150
  $ cd test-8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   151
  $ hg pull ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   152
  pulling from ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   153
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   154
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   155
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   156
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   157
  added 4 changesets with 2 changes to 3 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 27423
diff changeset
   158
  new changesets c70afb1ee985:faa2e4234c7a
38250
d0abd7949ea3 phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents: 38249
diff changeset
   159
  1 local changesets published
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   160
  (run 'hg heads' to see heads, 'hg merge' to merge)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   161
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   162
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   163
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   164
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   165
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   166
  checked 9 changesets with 7 changes to 4 files
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   167
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   168
  repository tip rolled back to revision 4 (undo pull)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   169
  $ cd ..
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   170
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   171
should fail
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   172
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   173
  $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   174
  abort: --base is incompatible with specifying a destination
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   175
  [255]
27422
67eeb7421d8d bundle: fix error for --all with destination
timeless <timeless@mozdev.org>
parents: 16913
diff changeset
   176
  $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
67eeb7421d8d bundle: fix error for --all with destination
timeless <timeless@mozdev.org>
parents: 16913
diff changeset
   177
  abort: --all is incompatible with specifying a destination
67eeb7421d8d bundle: fix error for --all with destination
timeless <timeless@mozdev.org>
parents: 16913
diff changeset
   178
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   179
  $ hg -R test bundle -r tip test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   180
  abort: repository default-push not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   181
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   182
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   183
  $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   184
  2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   185
  $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   186
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   187
  $ hg -R test bundle --base 2 test-bundle-all.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   188
  6 changesets found
27423
c953e26f3734 bundle: warn for --base with --all
timeless <timeless@mozdev.org>
parents: 27422
diff changeset
   189
  $ hg -R test bundle --base 2 --all test-bundle-all-2.hg
c953e26f3734 bundle: warn for --base with --all
timeless <timeless@mozdev.org>
parents: 27422
diff changeset
   190
  ignoring --base because --all was specified
c953e26f3734 bundle: warn for --base with --all
timeless <timeless@mozdev.org>
parents: 27422
diff changeset
   191
  9 changesets found
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   192
  $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   193
  1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   194
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   195
empty bundle
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   196
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   197
  $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   198
  no changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   199
  [1]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   200
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   201
issue76 msg2163
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   202
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   203
  $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
14073
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
   204
  no changes found
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
   205
  [1]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   206
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12316
diff changeset
   207
Issue1910: 'hg bundle --base $head' does not exclude $head from
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12316
diff changeset
   208
result
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   209
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   210
  $ hg -R test bundle --base 7 test-bundle-cset-7.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   211
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   212
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   213
  $ hg clone test-2 test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   214
  updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   215
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   216
  $ cd test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   217
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   218
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   219
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   220
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   221
  2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   222
  $ hg unbundle ../test-bundle-should-fail.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   223
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   224
  transaction abort!
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   225
  rollback completed
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   226
  abort: 00changelog.i@93ee6ab32777: unknown parent!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   227
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   228
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   229
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   230
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   231
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   232
  2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   233
  $ hg unbundle ../test-bundle-all.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   234
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   235
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   236
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   237
  added 6 changesets with 4 changes to 4 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   238
  new changesets 93ee6ab32777:916f1afdef90 (6 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   239
  (run 'hg heads' to see heads, 'hg merge' to merge)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   240
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   241
revision 8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   242
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   243
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   244
  8:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   245
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   246
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   247
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   248
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   249
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   250
  checked 9 changesets with 7 changes to 4 files
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   251
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   252
  repository tip rolled back to revision 2 (undo unbundle)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   253
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   254
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   255
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   256
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   257
  2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   258
  $ hg unbundle ../test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   259
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   260
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   261
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   262
  added 2 changesets with 2 changes to 2 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   263
  new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   264
  (run 'hg update' to get a working copy)
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   265
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   266
revision 4
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   267
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   268
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   269
  4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   270
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   271
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   272
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   273
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   274
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   275
  checked 5 changesets with 5 changes to 2 files
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   276
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   277
  repository tip rolled back to revision 2 (undo unbundle)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   278
  $ hg unbundle ../test-bundle-branch2.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   279
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   280
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   281
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   282
  added 4 changesets with 3 changes to 3 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   283
  new changesets c70afb1ee985:faa2e4234c7a (4 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   284
  (run 'hg heads' to see heads, 'hg merge' to merge)
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   285
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   286
revision 6
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
   287
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   288
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   289
  6:faa2e4234c7a
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   290
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   291
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   292
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   293
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   294
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   295
  checked 7 changesets with 6 changes to 3 files
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   296
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   297
  repository tip rolled back to revision 2 (undo unbundle)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   298
  $ hg unbundle ../test-bundle-cset-7.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   299
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   300
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   301
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   302
  added 2 changesets with 2 changes to 2 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   303
  new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   304
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   305
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   306
revision 4
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
   307
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   308
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   309
  4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   310
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   311
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   312
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   313
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   314
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   315
  checked 5 changesets with 5 changes to 2 files
3318
a225055b3b59 bundle --base: use the right set for the base
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3285
diff changeset
   316
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   317
  $ cd ../test
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   318
  $ hg merge 7
12757
62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12399
diff changeset
   319
  note: possible conflict - afile was renamed multiple times to:
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   320
   anotherfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   321
   adifferentfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   322
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   323
  (branch merge, don't forget to commit)
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   324
  $ hg ci -m merge
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   325
  $ cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   326
  $ hg -R test bundle --base 2 test-bundle-head.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   327
  7 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   328
  $ hg clone test-2 test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   329
  updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   330
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   331
  $ cd test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   332
  $ hg unbundle ../test-bundle-head.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   333
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   334
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   335
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   336
  added 7 changesets with 4 changes to 4 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38250
diff changeset
   337
  new changesets 93ee6ab32777:03fc0b0e347c (7 drafts)
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   338
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   339
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   340
revision 9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   341
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   342
  $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
   343
  9:03fc0b0e347c
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   344
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   345
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   346
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   347
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   348
  checking files
39489
f1186c292d03 verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents: 39480
diff changeset
   349
  checked 10 changesets with 7 changes to 4 files
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
   350
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
   351
  $ cd ..