tests/test-convert-cvs-branch.t
author Gregory Szorc <gregory.szorc@gmail.com>
Fri, 17 Aug 2018 19:12:25 +0000
changeset 39175 bbb855c412c6
parent 26420 2fc86d92c4a9
child 44722 e5e5ee2b60e4
permissions -rw-r--r--
dagutil: remove ability to invert instances The previous commit removed the last consumer of this feature. .. api:: remove inverse() methods from classes in dagutil Differential Revision: https://phab.mercurial-scm.org/D4323
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 20117
diff changeset
     1
#require cvs
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 20117
diff changeset
     2
26420
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 23675
diff changeset
     3
This is https://bz.mercurial-scm.org/1148
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 23675
diff changeset
     4
and https://bz.mercurial-scm.org/1447
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
     5
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     6
  $ cvscall()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     7
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     8
  >     cvs -f "$@" > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
     9
  > }
23172
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    10
  $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    11
  > [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    12
  > convert =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    13
  > [convert]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    14
  > cvsps.cache = 0
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    15
  > EOF
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    16
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    17
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
    18
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    19
  $ mkdir cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    20
  $ cd cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    21
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    22
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    23
  $ CVS_OPTIONS=-f
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    24
  $ export CVS_OPTIONS
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    25
  $ cd ..
23675
96529f81e2e9 tests: run 'cvs init' only on non-existent directories (issue4482)
Thomas Klausner <tk@giga.or.at>
parents: 23172
diff changeset
    26
  $ rmdir cvsrepo
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    27
  $ cvscall -q -d "$CVSROOT" init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    28
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    29
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
    30
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    31
  $ mkdir src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    32
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    33
  $ echo "1" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    34
  $ echo "1" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    35
  $ cvscall import -m "init" src v0 r0 | sort
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    36
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    37
  $ cvscall co src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    38
  cvs checkout: Updating src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    39
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    40
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    41
Branch the project
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    42
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    43
  $ cvscall tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    44
  cvs tag: Tagging .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    45
  $ cvscall up -r BRANCH > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    46
  cvs update: Updating .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    47
12785
c7d23b4ca4ba check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12640
diff changeset
    48
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
    49
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    50
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    51
  $ echo "2" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    52
  $ cvscall ci -m "mod a"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    53
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    54
  $ echo "2" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    55
  $ cvscall ci -m "mod b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    56
  cvs commit: Examining .
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    57
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    58
  $ echo "3" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    59
  $ cvscall ci -m "mod a again"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    60
  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
    61
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    62
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
    63
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    64
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    65
  $ hg convert src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    66
  assuming destination src-hg
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    67
  initializing destination src-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12580
diff changeset
    68
  connecting to $TESTTMP/cvsrepo
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    69
  scanning source...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    70
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    71
  7 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    72
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    73
  5 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    74
  sorting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    75
  converting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    76
  4 Initial revision
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    77
  3 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    78
  2 mod a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    79
  1 mod b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    80
  0 mod a again
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    81
  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
    82
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    83
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
    84
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16913
diff changeset
    85
  $ 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
    86
  o  5 () update tags files: .hgtags
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  4 (BRANCH) mod a again 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  3 (BRANCH) mod b files: b
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  2 (BRANCH) mod a files: a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    93
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    94
  | o  1 (v0) init files:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    95
  |/
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    96
  o  0 () Initial revision files: a b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    97
  
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    98
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    99
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   100
issue 1447
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
   101
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   102
  $ cvscall()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   103
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   104
  >     cvs -f "$@" > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   105
  >     sleep 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   106
  > }
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   107
  $ cvsci()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   108
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   109
  >     cvs -f ci "$@" >/dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   110
  >     sleep 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   111
  > }
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   112
  $ cvscall -Q -d `pwd`/cvsmaster2 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   113
  $ cd cvsmaster2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   114
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   115
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   116
  $ mkdir foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   117
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   118
  $ cvscall -Q co -d cvswork2 foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   119
  $ cd cvswork2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   120
  $ echo foo > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   121
  $ echo bar > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   122
  $ cvscall -Q add a.txt b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   123
  $ cvsci -m "Initial commit"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   124
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   125
  $ echo foo > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   126
  $ cvsci -m "Fix b on HEAD"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   127
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   128
  $ echo bar > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   129
  $ cvsci -m "Small fix in a on HEAD"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   130
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   131
  $ cvscall -Q tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   132
  $ cvscall -Q up -P -rBRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   133
  $ echo baz > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   134
  $ cvsci -m "Change on BRANCH in b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   135
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   136
  $ hg debugcvsps -x --parents foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   137
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   138
  5 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   139
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   140
  4 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   141
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   142
  PatchSet 1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   143
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   144
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   145
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   146
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   147
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   148
  Initial commit
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
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   151
  	a.txt:INITIAL->1.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   152
  	b.txt:INITIAL->1.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   153
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   154
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   155
  PatchSet 2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   156
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   157
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   158
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   159
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   160
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   161
  Parent: 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   162
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   163
  Fix b on HEAD
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
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   166
  	b.txt:1.1->1.2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   167
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   168
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   169
  PatchSet 3 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   170
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   171
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   172
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   173
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   174
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   175
  Parent: 2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   176
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   177
  Small fix in a on HEAD
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
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   180
  	a.txt:1.1->1.2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   181
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   182
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   183
  PatchSet 4 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   184
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   185
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   186
  Branch: BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   187
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   188
  Parent: 3
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   189
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   190
  Change on BRANCH in b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   191
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   192
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   193
  	b.txt:1.2->1.2.2.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   194
  
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
   195
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12785
diff changeset
   196
  $ cd ..