tests/test-filebranch.t
author Gregory Szorc <gregory.szorc@gmail.com>
Fri, 17 Aug 2018 19:12:25 +0000
changeset 39175 bbb855c412c6
parent 37283 d4e62df1c73d
child 39489 f1186c292d03
permissions -rw-r--r--
dagutil: remove ability to invert instances The previous commit removed the last consumer of this feature. .. api:: remove inverse() methods from classes in dagutil Differential Revision: https://phab.mercurial-scm.org/D4323
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     1
This test makes sure that we don't mark a file as merged with its ancestor
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     2
when we do a merge.
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
     3
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     4
  $ cat <<EOF > merge
33721
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33286
diff changeset
     5
  > from __future__ import print_function
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     6
  > import sys, os
33721
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33286
diff changeset
     7
  > print("merging for", os.path.basename(sys.argv[1]))
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     8
  > EOF
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 22896
diff changeset
     9
  $ HGMERGE="$PYTHON ../merge"; export HGMERGE
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    10
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    11
Creating base:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    12
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    13
  $ hg init a
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    14
  $ cd a
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    15
  $ echo 1 > foo
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    16
  $ echo 1 > bar
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    17
  $ echo 1 > baz
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    18
  $ echo 1 > quux
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    19
  $ hg add foo bar baz quux
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    20
  $ hg commit -m "base"
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    21
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    22
  $ cd ..
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    23
  $ hg clone a b
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    24
  updating to branch default
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    25
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    26
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    27
Creating branch a:
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    28
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    29
  $ cd a
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    30
  $ echo 2a > foo
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    31
  $ echo 2a > bar
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    32
  $ hg commit -m "branch a"
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    33
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    34
Creating branch b:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    35
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    36
  $ cd ..
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    37
  $ cd b
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    38
  $ echo 2b > foo
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    39
  $ echo 2b > baz
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    40
  $ hg commit -m "branch b"
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    41
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    42
We shouldn't have anything but n state here:
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    43
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    44
  $ hg debugstate --nodates | grep -v "^n"
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12192
diff changeset
    45
  [1]
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    46
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    47
Merging:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    48
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    49
  $ hg pull ../a
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    50
  pulling from ../a
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    51
  searching for changes
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    52
  adding changesets
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    53
  adding manifests
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    54
  adding file changes
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    55
  added 1 changesets with 2 changes to 2 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33721
diff changeset
    56
  new changesets bdd988058d16
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    57
  (run 'hg heads' to see heads, 'hg merge' to merge)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    58
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    59
  $ hg merge -v
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    60
  resolving manifests
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    61
  getting bar
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    62
  merging foo
13439
d724a69309e0 util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
    63
  merging for foo
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    64
  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    65
  (branch merge, don't forget to commit)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    66
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    67
  $ echo 2m > foo
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    68
  $ echo 2b > baz
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    69
  $ echo new > quux
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    70
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    71
  $ hg ci -m "merge"
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    72
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    73
main: we should have a merge here:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    74
14323
a79fea6b3e77 debugindex etc.: add --changelog and --manifest options
Sune Foldager <cryo@cyanite.org>
parents: 14182
diff changeset
    75
  $ hg debugindex --changelog
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
    76
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
    77
       0       0 cdca01651b96 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
    78
       1       1 f6718a9cb7f3 cdca01651b96 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
    79
       2       2 bdd988058d16 cdca01651b96 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
    80
       3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    81
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    82
log should show foo and quux changed:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    83
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    84
  $ hg log -v -r tip
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    85
  changeset:   3:d8a521142a3c
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    86
  tag:         tip
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    87
  parent:      1:f6718a9cb7f3
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    88
  parent:      2:bdd988058d16
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    89
  user:        test
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    90
  date:        Thu Jan 01 00:00:00 1970 +0000
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    91
  files:       foo quux
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    92
  description:
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    93
  merge
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    94
  
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    95
  
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    96
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    97
foo: we should have a merge here:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
    98
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13439
diff changeset
    99
  $ hg debugindex foo
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   100
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   101
       0       0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   102
       1       1 2ffeddde1b65 b8e02f643373 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   103
       2       2 33d1fb69067a b8e02f643373 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   104
       3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   105
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   106
bar: we should not have a merge here:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   107
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13439
diff changeset
   108
  $ hg debugindex bar
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   109
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   110
       0       0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   111
       1       2 33d1fb69067a b8e02f643373 000000000000
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   112
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   113
baz: we should not have a merge here:
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
   114
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13439
diff changeset
   115
  $ hg debugindex baz
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   116
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   117
       0       0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   118
       1       1 2ffeddde1b65 b8e02f643373 000000000000
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   119
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   120
quux: we should not have a merge here:
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   121
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13439
diff changeset
   122
  $ hg debugindex quux
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   123
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   124
       0       0 b8e02f643373 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   125
       1       3 6128c0f33108 b8e02f643373 000000000000
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   126
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   127
Manifest entries should match tips of all files:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   128
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   129
  $ hg manifest --debug
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   130
  33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   131
  2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   132
  aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   133
  6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   134
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   135
Everything should be clean now:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   136
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   137
  $ hg status
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
   138
12192
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   139
  $ hg verify
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   140
  checking changesets
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   141
  checking manifests
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   142
  crosschecking files in changesets and manifests
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   143
  checking files
968e9057ab8a tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
   144
  4 files, 4 changesets, 10 total revisions
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
   145
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14323
diff changeset
   146
  $ cd ..