tests/test-bundle-r.t
author Matt Mackall <mpm@selenic.com>
Wed, 23 Feb 2011 17:27:05 -0600
branchstable
changeset 13468 d100702326d5
parent 13446 1e497df514e2
child 14073 72c84f24b420
child 14117 07708f4171f1
permissions -rw-r--r--
context: generate file ancestors in reverse revision order (issue2642) The related() function in copies assumes that revisions are generated in reverse revision order, so it was getting confused in some situations.
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
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     3
  $ echo "0" >> afile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     4
  $ hg add afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
     5
  $ hg commit -m "0.0"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     6
  $ echo "1" >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
     7
  $ hg commit -m "0.1"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
     8
  $ echo "2" >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
     9
  $ hg commit -m "0.2"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    10
  $ echo "3" >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    11
  $ hg commit -m "0.3"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    12
  $ hg update -C 0
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    13
  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
    14
  $ echo "1" >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    15
  $ hg commit -m "1.1"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    16
  created new head
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    17
  $ echo "2" >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    18
  $ hg commit -m "1.2"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    19
  $ echo "a line" > fred
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    20
  $ echo "3" >> afile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    21
  $ hg add fred
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    22
  $ hg commit -m "1.3"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    23
  $ hg mv afile adifferentfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    24
  $ hg commit -m "1.3m"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    25
  $ hg update -C 3
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    26
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    27
  $ hg mv afile anotherfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    28
  $ hg commit -m "0.3m"
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    29
  $ hg debugindex .hg/store/data/afile.i
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    30
     rev    offset  length   base linkrev nodeid       p1           p2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    31
       0         0       3      0       0 362fef284ce2 000000000000 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    32
       1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    33
       2         8       7      2       2 4c982badb186 125144f7e028 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    34
       3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    35
  $ hg debugindex .hg/store/data/adifferentfile.i
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    36
     rev    offset  length   base linkrev nodeid       p1           p2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    37
       0         0      75      0       7 2565f3199a74 000000000000 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    38
  $ hg debugindex .hg/store/data/anotherfile.i
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    39
     rev    offset  length   base linkrev nodeid       p1           p2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    40
       0         0      75      0       8 2565f3199a74 000000000000 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    41
  $ hg debugindex .hg/store/data/fred.i
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    42
     rev    offset  length   base linkrev nodeid       p1           p2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    43
       0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    44
  $ hg debugindex .hg/store/00manifest.i
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    45
     rev    offset  length   base linkrev nodeid       p1           p2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    46
       0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    47
       1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    48
       2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    49
       3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    50
       4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    51
       5       250      68      3       7 09bb521d218d de68e904d169 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    52
       6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    53
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    54
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    55
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    56
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    57
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    58
  4 files, 9 changesets, 7 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    59
  $ cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    60
  $ 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
    61
  >    mkdir test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    62
  >    hg --cwd test-"$i" init
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    63
  >    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
    64
  >    cd test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    65
  >    hg unbundle ../test-"$i".hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    66
  >    hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    67
  >    hg tip -q
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    68
  >    cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    69
  > done
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    70
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    71
  1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    72
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    73
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    74
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    75
  added 1 changesets with 1 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    76
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    77
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    78
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    79
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    80
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    81
  1 files, 1 changesets, 1 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    82
  0:f9ee2f85a263
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    83
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    84
  2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    85
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    86
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    87
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    88
  added 2 changesets with 2 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    89
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    90
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    91
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    92
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    93
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    94
  1 files, 2 changesets, 2 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
    95
  1:34c2bf6b0626
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    96
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    97
  3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    98
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
    99
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   100
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   101
  added 3 changesets with 3 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   102
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   103
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   104
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   105
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   106
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   107
  1 files, 3 changesets, 3 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   108
  2:e38ba6f5b7e0
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   109
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   110
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   111
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   112
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   113
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   114
  added 4 changesets with 4 changes to 1 files
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
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   120
  1 files, 4 changesets, 4 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   121
  3:eebf5a27f8ca
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
  2 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 2 changesets with 2 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   128
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   129
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   130
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   131
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   132
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   133
  1 files, 2 changesets, 2 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   134
  1:095197eb4973
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   135
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   136
  3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   137
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   138
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   139
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   140
  added 3 changesets with 3 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   141
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   142
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   143
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   144
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   145
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   146
  1 files, 3 changesets, 3 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   147
  2:1bb50a9436a7
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   148
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   149
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   150
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   151
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   152
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   153
  added 4 changesets with 5 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   154
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   155
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   156
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   157
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   158
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   159
  2 files, 4 changesets, 5 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   160
  3:7373c1169842
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   161
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   162
  5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   163
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   164
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   165
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   166
  added 5 changesets with 6 changes to 3 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   167
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   168
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   169
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   170
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   171
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   172
  3 files, 5 changesets, 6 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   173
  4:a6a34bfa0076
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   174
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   175
  5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   176
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   177
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   178
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   179
  added 5 changesets with 5 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   180
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   181
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   182
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   183
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   184
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   185
  2 files, 5 changesets, 5 total revisions
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   186
  4:aa35859c02ea
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   187
  $ cd test-8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   188
  $ hg pull ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   189
  pulling from ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   190
  searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   191
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   192
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   193
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   194
  added 4 changesets with 2 changes to 3 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   195
  (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
   196
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   197
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   198
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   199
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   200
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   201
  4 files, 9 changesets, 7 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   202
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   203
  repository tip rolled back to revision 4 (undo pull)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   204
  working directory now based on revision -1
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   205
  $ cd ..
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
   206
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   207
should fail
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   208
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   209
  $ 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
   210
  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
   211
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   212
  $ 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
   213
  abort: repository default-push not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   214
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   215
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   216
  $ 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
   217
  2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   218
  $ 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
   219
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   220
  $ 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
   221
  6 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   222
  $ 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
   223
  1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   224
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   225
empty bundle
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   226
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   227
  $ 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
   228
  no changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   229
  [1]
11871
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
issue76 msg2163
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   232
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   233
  $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   234
  1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   235
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12316
diff changeset
   236
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
   237
result
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   238
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   239
  $ 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
   240
  4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   241
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   242
  $ hg clone test-2 test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   243
  updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   244
  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
   245
  $ cd test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   246
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   247
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   248
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   249
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   250
  2:e38ba6f5b7e0
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   251
  $ hg unbundle ../test-bundle-should-fail.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   252
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   253
  transaction abort!
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   254
  rollback completed
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   255
  abort: 00changelog.i@eebf5a27f8ca: unknown parent!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   256
  [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   257
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   258
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   259
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   260
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   261
  2:e38ba6f5b7e0
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   262
  $ hg unbundle ../test-bundle-all.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   263
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   264
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   265
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   266
  added 6 changesets with 4 changes to 4 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   267
  (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
   268
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   269
revision 8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   270
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   271
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   272
  8:aa35859c02ea
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   273
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   274
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   275
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   276
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   277
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   278
  4 files, 9 changesets, 7 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   279
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   280
  repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   281
  working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   282
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   283
revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   284
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   285
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   286
  2:e38ba6f5b7e0
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   287
  $ hg unbundle ../test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   288
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   289
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   290
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   291
  added 2 changesets with 2 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   292
  (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
   293
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   294
revision 4
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   295
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   296
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   297
  4:aa35859c02ea
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   298
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   299
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   300
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   301
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   302
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   303
  2 files, 5 changesets, 5 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   304
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   305
  repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   306
  working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   307
  $ hg unbundle ../test-bundle-branch2.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   308
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   309
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   310
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   311
  added 4 changesets with 3 changes to 3 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   312
  (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
   313
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   314
revision 6
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
   315
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   316
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   317
  6:a6a34bfa0076
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   318
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   319
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   320
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   321
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   322
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   323
  3 files, 7 changesets, 6 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   324
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   325
  repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
   326
  working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   327
  $ hg unbundle ../test-bundle-cset-7.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   328
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   329
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   330
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   331
  added 2 changesets with 2 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   332
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   333
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   334
revision 4
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
   335
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   336
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   337
  4:aa35859c02ea
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   338
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   339
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   340
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   341
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   342
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   343
  2 files, 5 changesets, 5 total revisions
3318
a225055b3b59 bundle --base: use the right set for the base
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3285
diff changeset
   344
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   345
  $ cd ../test
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   346
  $ 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
   347
  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
   348
   anotherfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   349
   adifferentfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   350
  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
   351
  (branch merge, don't forget to commit)
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   352
  $ hg ci -m merge
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   353
  $ cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   354
  $ 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
   355
  7 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   356
  $ hg clone test-2 test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   357
  updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   358
  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
   359
  $ cd test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   360
  $ hg unbundle ../test-bundle-head.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   361
  adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   362
  adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   363
  adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   364
  added 7 changesets with 4 changes to 4 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   365
  (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   366
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   367
revision 9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   368
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   369
  $ hg tip -q
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
   370
  9:905597b0d5d4
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   371
  $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   372
  checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   373
  checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   374
  crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   375
  checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
   376
  4 files, 10 changesets, 7 total revisions