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