tests/test-convert-cvs.t
author Simon Heimberg <simohe@besonet.ch>
Wed, 22 Jan 2014 16:34:36 +0100
branchstable
changeset 20321 4d60a7fe3e8a
parent 20117 aa9385f983fa
child 22046 7a9cbb315d84
permissions -rw-r--r--
i18n: do not translate rst syntax .. note:: .. note:: is rst syntax which must not be translated. Fix this in the translations. This is not the first time this happens, so there should be a note for the translator. A later patch will change the generation of the po files to write this automatically. A test in i18n/check-translation.py could help as well.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
     1
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     2
  $ "$TESTDIR/hghave" cvs || exit 80
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     3
  $ cvscall()
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     4
  > {
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     5
  >     cvs -f "$@"
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     6
  > }
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     7
  $ hgcat()
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     8
  > {
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     9
  >     hg --cwd src-hg cat -r tip "$1"
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    10
  > }
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    11
  $ echo "[extensions]" >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    12
  $ echo "convert = " >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    13
  $ cat > cvshooks.py <<EOF
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    14
  > def cvslog(ui,repo,hooktype,log):
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    15
  >     print "%s hook: %d entries"%(hooktype,len(log))
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    16
  > 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    17
  > def cvschangesets(ui,repo,hooktype,changesets):
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    18
  >     print "%s hook: %d changesets"%(hooktype,len(changesets))
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    19
  > EOF
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    20
  $ hookpath=`pwd`
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    21
  $ echo "[hooks]" >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    22
  $ echo "cvslog=python:$hookpath/cvshooks.py:cvslog" >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    23
  $ echo "cvschangesets=python:$hookpath/cvshooks.py:cvschangesets" >> $HGRCPATH
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    24
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    25
create cvs repository
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    26
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    27
  $ mkdir cvsrepo
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    28
  $ cd cvsrepo
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    29
  $ CVSROOT=`pwd`
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    30
  $ export CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    31
  $ CVS_OPTIONS=-f
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    32
  $ export CVS_OPTIONS
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    33
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    34
  $ cvscall -q -d "$CVSROOT" init
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    35
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    36
create source directory
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    37
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    38
  $ mkdir src-temp
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    39
  $ cd src-temp
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    40
  $ echo a > a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    41
  $ mkdir b
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    42
  $ cd b
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    43
  $ echo c > c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    44
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    45
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    46
import source directory
6717
2011bb8ada9a convert: hg sink commits without working dir
Patrick Mezard <pmezard@gmail.com>
parents: 6690
diff changeset
    47
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    48
  $ cvscall -q import -m import src INITIAL start
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    49
  N src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    50
  N src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    51
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    52
  No conflicts created by this import
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    53
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    54
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    55
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    56
checkout source directory
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    57
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    58
  $ cvscall -q checkout src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    59
  U src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    60
  U src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    61
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    62
commit a new revision changing b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    63
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    64
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    65
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    66
  $ echo c >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    67
  $ cvscall -q commit -mci0 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
    68
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    69
  $ cd ..
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
    70
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    71
convert fresh repo and also check localtimezone option
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    72
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    73
NOTE: This doesn't check all time zones -- it merely determines that
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    74
the configuration option is taking effect.
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
    75
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    76
An arbitrary (U.S.) time zone is used here.  TZ=US/Hawaii is selected
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    77
since it does not use DST (unlike other U.S. time zones) and is always
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    78
a fixed difference from UTC.
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    79
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    80
  $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    81
  initializing destination src-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
    82
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    83
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    84
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    85
  5 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    86
  cvslog hook: 5 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    87
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    88
  3 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    89
  cvschangesets hook: 3 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    90
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    91
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    92
  2 Initial revision
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
    93
  1 ci0
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
    94
  0 import
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    95
  updating tags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    96
  $ hgcat a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    97
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    98
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    99
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   100
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   101
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   102
convert fresh repo with --filemap
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
   103
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   104
  $ echo include b/c > filemap
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   105
  $ hg convert --filemap filemap src src-filemap
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   106
  initializing destination src-filemap repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   107
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   108
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   109
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   110
  5 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   111
  cvslog hook: 5 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   112
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   113
  3 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   114
  cvschangesets hook: 3 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   115
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   116
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   117
  2 Initial revision
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   118
  1 ci0
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   119
  0 import
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   120
  filtering out empty revision
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   121
  repository tip rolled back to revision 1 (undo commit)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   122
  updating tags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   123
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   124
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   125
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   126
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   127
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   128
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   129
  0 Initial revision files: b/c
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   130
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   131
convert full repository (issue1649)
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   132
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   133
  $ cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   134
  U srcfull/src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   135
  U srcfull/src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   136
  $ ls srcfull
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   137
  CVS
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   138
  CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   139
  src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   140
  $ hg convert srcfull srcfull-hg \
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   141
  >     | grep -v 'log entries' | grep -v 'hook:' \
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   142
  >     | grep -v '^[0-3] .*' # filter instable changeset order
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   143
  initializing destination srcfull-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   144
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   145
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   146
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   147
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   148
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   149
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   150
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   151
  updating tags
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   152
  $ hg cat -r tip --cwd srcfull-hg src/a
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   153
  a
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   154
  $ hg cat -r tip --cwd srcfull-hg src/b/c
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   155
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   156
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   157
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   158
commit new file revisions
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   159
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   160
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   161
  $ echo a >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   162
  $ echo c >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   163
  $ cvscall -q commit -mci1 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   164
  $TESTTMP/cvsrepo/src/a,v  <--  a
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   165
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   166
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   167
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   168
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   169
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   170
  $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   171
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   172
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   173
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   174
  7 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   175
  cvslog hook: 7 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   176
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   177
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   178
  cvschangesets hook: 4 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   179
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   180
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   181
  0 ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   182
  $ hgcat a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   183
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   184
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   185
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   186
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   187
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   188
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   189
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   190
convert again with --filemap
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   191
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   192
  $ hg convert --filemap filemap src src-filemap
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   193
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   194
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   195
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   196
  7 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   197
  cvslog hook: 7 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   198
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   199
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   200
  cvschangesets hook: 4 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   201
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   202
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   203
  0 ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   204
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   205
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   206
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   207
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   208
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   209
  3 ci1 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   210
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   211
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   212
  0 Initial revision files: b/c
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   213
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   214
commit branch
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   215
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   216
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   217
  $ cvs -q update -r1.1 b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   218
  U b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   219
  $ cvs -q tag -b branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   220
  T a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   221
  T b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   222
  $ cvs -q update -r branch > /dev/null
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   223
  $ echo d >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   224
  $ cvs -q commit -mci2 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   225
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   226
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   227
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   228
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   229
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   230
  $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   231
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   232
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   233
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   234
  8 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   235
  cvslog hook: 8 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   236
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   237
  5 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   238
  cvschangesets hook: 5 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   239
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   240
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   241
  0 ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   242
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   243
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   244
  d
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   245
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   246
convert again with --filemap
10695
b4b16e90712f convert: teach cvsps to handle . repository (issue1649)
Mathieu Clabaut <mathieu.clabaut@systerel.fr>
parents: 10276
diff changeset
   247
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   248
  $ TZ=US/Hawaii hg convert --config convert.localtimezone=True --filemap filemap src src-filemap
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   249
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   250
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   251
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   252
  8 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   253
  cvslog hook: 8 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   254
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   255
  5 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   256
  cvschangesets hook: 5 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   257
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   258
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   259
  0 ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   260
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   261
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   262
  d
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   263
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   264
  4 ci2 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   265
  3 ci1 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   266
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   267
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   268
  0 Initial revision files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   269
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   270
commit a new revision with funny log message
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   271
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   272
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   273
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   274
  $ echo e >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   275
  $ cvscall -q commit -m'funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   276
  > ----------------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   277
  > log message' . | grep '<--' |\
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   278
  >  sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   279
  checking in src/a,v
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   280
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   281
commit new file revisions with some fuzz
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   282
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   283
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   284
  $ echo f >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   285
  $ cvscall -q commit -mfuzzy . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   286
  $TESTTMP/cvsrepo/src/a,v  <--  a
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   287
  $ sleep 4 # the two changes will be split if fuzz < 4
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   288
  $ echo g >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   289
  $ cvscall -q commit -mfuzzy . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   290
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   291
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   292
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   293
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   294
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   295
  $ TZ=US/Hawaii hg convert --config convert.cvsps.fuzz=2 --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   296
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   297
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   298
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   299
  11 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   300
  cvslog hook: 11 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   301
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   302
  8 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   303
  cvschangesets hook: 8 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   304
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   305
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   306
  2 funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   307
  1 fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   308
  0 fuzzy
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18376
diff changeset
   309
  $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   310
  o  8 (branch) fuzzy date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   311
  |
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   312
  o  7 (branch) fuzzy date: * -1000 files: a (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   313
  |
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   314
  o  6 (branch) funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   315
  |  ----------------------------
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   316
  |  log message date: * -1000 files: a (glob)
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   317
  o  5 (branch) ci2 date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   318
  
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   319
  o  4 () ci1 date: * -1000 files: a b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   320
  |
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   321
  o  3 () update tags date: * +0000 files: .hgtags (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   322
  |
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   323
  | o  2 (INITIAL) import date: * -1000 files: (glob)
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   324
  | |
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   325
  o |  1 () ci0 date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   326
  |/
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   327
  o  0 () Initial revision date: * -1000 files: a b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   328
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   329
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   330
testing debugcvsps
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   331
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   332
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   333
  $ hg debugcvsps --fuzz=2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   334
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   335
  11 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   336
  cvslog hook: 11 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   337
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   338
  10 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   339
  cvschangesets hook: 10 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   340
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   341
  PatchSet 1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   342
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   343
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   344
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   345
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   346
  Branchpoints: INITIAL 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   347
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   348
  Initial revision
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   349
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   350
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   351
  	a:INITIAL->1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   352
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   353
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   354
  PatchSet 2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   355
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   356
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   357
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   358
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   359
  Branchpoints: INITIAL, branch 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   360
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   361
  Initial revision
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   362
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   363
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   364
  	b/c:INITIAL->1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   365
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   366
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   367
  PatchSet 3 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   368
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   369
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   370
  Branch: INITIAL
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   371
  Tag: start 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   372
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   373
  import
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   374
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   375
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   376
  	a:1.1->1.1.1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   377
  	b/c:1.1->1.1.1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   378
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   379
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   380
  PatchSet 4 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   381
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   382
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   383
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   384
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   385
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   386
  ci0
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   387
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   388
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   389
  	b/c:1.1->1.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   390
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   391
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   392
  PatchSet 5 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   393
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   394
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   395
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   396
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   397
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   398
  ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   399
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   400
  Members: 
18262
ed923a2d5ae9 tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents: 17974
diff changeset
   401
  	b/c:1.2->1.3 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   402
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   403
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   404
  PatchSet 6 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   405
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   406
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   407
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   408
  Tag: (none) 
18262
ed923a2d5ae9 tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents: 17974
diff changeset
   409
  Branchpoints: branch 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   410
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   411
  ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   412
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   413
  Members: 
18262
ed923a2d5ae9 tests: update test-convert-cvs*.t
Bryan O'Sullivan <bos@serpentine.com>
parents: 17974
diff changeset
   414
  	a:1.1->1.2 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   415
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   416
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   417
  PatchSet 7 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   418
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   419
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   420
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   421
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   422
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   423
  ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   424
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   425
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   426
  	b/c:1.1->1.1.2.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   427
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   428
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   429
  PatchSet 8 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   430
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   431
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   432
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   433
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   434
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   435
  funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   436
  ----------------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   437
  log message
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   438
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   439
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   440
  	a:1.2->1.2.2.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   441
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   442
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   443
  PatchSet 9 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   444
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   445
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   446
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   447
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   448
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   449
  fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   450
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   451
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   452
  	a:1.2.2.1->1.2.2.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   453
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   454
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   455
  PatchSet 10 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   456
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   457
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   458
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   459
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   460
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   461
  fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   462
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   463
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   464
  	b/c:1.1.2.1->1.1.2.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   465
  
7594
a204547790bc test: added testcase for cvsps log message lookahead
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 7503
diff changeset
   466
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   467
  $ cd ..