tests/test-convert-cvs-branch.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Sat, 12 Apr 2014 00:53:15 -0400
changeset 21003 0f7e01e0c06f
parent 20117 aa9385f983fa
child 22046 7a9cbb315d84
permissions -rw-r--r--
bundle2: use chunkbuffer for exchange.getbundle We can use `util.chunkbuffer` instead.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     1
This is http://mercurial.selenic.com/bts/issue1148
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     2
and http://mercurial.selenic.com/bts/issue1447
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
     3
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     4
  $ "$TESTDIR/hghave" cvs || exit 80
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     5
  $ cvscall()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     6
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     7
  >     cvs -f "$@" > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     8
  > }
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     9
  $ echo "[extensions]" >> $HGRCPATH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    10
  $ echo "convert = " >> $HGRCPATH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    11
  $ echo "[convert]" >> $HGRCPATH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    12
  $ echo "cvsps.cache=0" >> $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
    13
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    14
create cvs repository
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    15
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    16
  $ mkdir cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    17
  $ cd cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    18
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    19
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    20
  $ CVS_OPTIONS=-f
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    21
  $ export CVS_OPTIONS
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    22
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    23
  $ cvscall -q -d "$CVSROOT" init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    24
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    25
Create a new project
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    26
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    27
  $ mkdir src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    28
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    29
  $ echo "1" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    30
  $ echo "1" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    31
  $ cvscall import -m "init" src v0 r0 | sort
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    32
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    33
  $ cvscall co src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    34
  cvs checkout: Updating src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    35
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    36
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    37
Branch the project
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    38
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    39
  $ cvscall tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    40
  cvs tag: Tagging .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    41
  $ cvscall up -r BRANCH > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    42
  cvs update: Updating .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    43
12785
c7d23b4ca4ba check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12640
diff changeset
    44
Modify file a, then b, then a
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    45
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    46
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    47
  $ echo "2" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    48
  $ cvscall ci -m "mod a"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    49
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    50
  $ echo "2" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    51
  $ cvscall ci -m "mod b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    52
  cvs commit: Examining .
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    53
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    54
  $ echo "3" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    55
  $ cvscall ci -m "mod a again"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    56
  cvs commit: Examining .
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
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    58
Convert
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    59
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    60
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    61
  $ hg convert src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    62
  assuming destination src-hg
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    63
  initializing destination src-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12580
diff changeset
    64
  connecting to $TESTTMP/cvsrepo
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    65
  scanning source...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    66
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    67
  7 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    68
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    69
  5 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    70
  sorting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    71
  converting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    72
  4 Initial revision
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    73
  3 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    74
  2 mod a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    75
  1 mod b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    76
  0 mod a again
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    77
  updating tags
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    78
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    79
Check the result
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    80
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16913
diff changeset
    81
  $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} files: {files}\n'
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    82
  o  5 () update tags files: .hgtags
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    83
  |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    84
  | o  4 (BRANCH) mod a again files: a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    85
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    86
  | o  3 (BRANCH) mod b files: b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    87
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    88
  | o  2 (BRANCH) mod a files: a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    89
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    90
  | o  1 (v0) init files:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    91
  |/
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    92
  o  0 () Initial revision files: a b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    93
  
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    94
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    95
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    96
issue 1447
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
    97
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    98
  $ cvscall()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    99
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   100
  >     cvs -f "$@" > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   101
  >     sleep 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   102
  > }
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   103
  $ cvsci()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   104
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   105
  >     cvs -f ci "$@" >/dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   106
  >     sleep 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   107
  > }
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   108
  $ cvscall -Q -d `pwd`/cvsmaster2 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   109
  $ cd cvsmaster2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   110
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   111
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   112
  $ mkdir foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   113
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   114
  $ cvscall -Q co -d cvswork2 foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   115
  $ cd cvswork2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   116
  $ echo foo > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   117
  $ echo bar > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   118
  $ cvscall -Q add a.txt b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   119
  $ cvsci -m "Initial commit"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   120
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   121
  $ echo foo > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   122
  $ cvsci -m "Fix b on HEAD"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   123
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   124
  $ echo bar > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   125
  $ cvsci -m "Small fix in a on HEAD"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   126
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   127
  $ cvscall -Q tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   128
  $ cvscall -Q up -P -rBRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   129
  $ echo baz > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   130
  $ cvsci -m "Change on BRANCH in b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   131
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   132
  $ hg debugcvsps -x --parents foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   133
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   134
  5 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   135
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   136
  4 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   137
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   138
  PatchSet 1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   139
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   140
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   141
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   142
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   143
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   144
  Initial commit
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   145
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   146
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   147
  	a.txt:INITIAL->1.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   148
  	b.txt:INITIAL->1.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   149
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   150
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   151
  PatchSet 2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   152
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   153
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   154
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   155
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   156
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   157
  Parent: 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   158
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   159
  Fix b on HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   160
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   161
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   162
  	b.txt:1.1->1.2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   163
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   164
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   165
  PatchSet 3 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   166
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   167
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   168
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   169
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   170
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   171
  Parent: 2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   172
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   173
  Small fix in a on HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   174
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   175
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   176
  	a.txt:1.1->1.2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   177
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   178
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   179
  PatchSet 4 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   180
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   181
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   182
  Branch: BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   183
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   184
  Parent: 3
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   185
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   186
  Change on BRANCH in b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   187
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   188
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   189
  	b.txt:1.2->1.2.2.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   190
  
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
   191
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12785
diff changeset
   192
  $ cd ..