tests/test-convert-cvs-branch.t
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 24 Dec 2011 19:05:35 +0900
branchstable
changeset 15723 1581da01d5c4
parent 12785 c7d23b4ca4ba
child 16913 f2719b387380
permissions -rw-r--r--
windows: use normalized path as path to subrepo path to subrepo is used to identify or check location of subrepo. it should be normalized (in "/" delimiter form), because it is also used with narrowmatcher which uses only normalized path even on Windows environment. this patch applies "util.pconvert()" on path to subrepo (called "subpath") to normalize it. for this patch, referers of below were checked. - subrepo.state() - subrepo.itersubrepos() - subrepo.subrepo() - context.sub() - context.substate() typical usecase is: for subpath in ctx.substate: sub = ctx.sub(subpath) ... ctx.substate[subpath] .... in this case, normalization has no side effect, because keys given from substate are used as key itself. other cases shown below also seem to require subpath to be normalized. - path components are joined by "/", in "commands.forget()": for subpath in ctx.substate: subforget[subpath + '/' + fsub] = (fsub, sub) - normalized "file" is used to check below condition, in "commands.revert()", "localrepository.commit()", and "localrepository._checknested()" file in ctx.substate - substate.keys() is passed to dirstate.walk()/status() which use only normalized pathes
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 "graphlog = " >> $HGRCPATH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    12
  $ echo "[convert]" >> $HGRCPATH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    13
  $ 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
    14
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    15
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
    16
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    17
  $ mkdir cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    18
  $ cd cvsrepo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    19
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    20
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    21
  $ CVS_OPTIONS=-f
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    22
  $ export CVS_OPTIONS
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    23
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    24
  $ cvscall -q -d "$CVSROOT" init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    25
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    26
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
    27
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    28
  $ mkdir src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    29
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    30
  $ echo "1" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    31
  $ echo "1" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    32
  $ cvscall import -m "init" src v0 r0 | sort
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    33
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    34
  $ cvscall co src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    35
  cvs checkout: Updating src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    36
  $ cd src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    37
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    38
Branch the project
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    39
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    40
  $ cvscall tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    41
  cvs tag: Tagging .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    42
  $ cvscall up -r BRANCH > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    43
  cvs update: Updating .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    44
12785
c7d23b4ca4ba check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12640
diff changeset
    45
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
    46
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    47
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    48
  $ echo "2" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    49
  $ cvscall ci -m "mod a"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    50
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    51
  $ echo "2" > b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    52
  $ cvscall ci -m "mod b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    53
  cvs commit: Examining .
12580
0ae639c75b8c test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com>
parents: 12520
diff changeset
    54
  $ sleep 1
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    55
  $ echo "3" > a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    56
  $ cvscall ci -m "mod a again"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    57
  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
    58
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    59
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
    60
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    61
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    62
  $ hg convert src
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    63
  assuming destination src-hg
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    64
  initializing destination src-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12580
diff changeset
    65
  connecting to $TESTTMP/cvsrepo
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    66
  scanning source...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    67
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    68
  7 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    69
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    70
  5 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    71
  sorting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    72
  converting...
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    73
  4 Initial revision
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    74
  3 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    75
  2 mod a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    76
  1 mod b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    77
  0 mod a again
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    78
  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
    79
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    80
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
    81
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    82
  $ hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    83
  o  5 () update tags files: .hgtags
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    84
  |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    85
  | o  4 (BRANCH) mod a again files: a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    86
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    87
  | o  3 (BRANCH) mod b files: b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    88
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    89
  | o  2 (BRANCH) mod a files: a
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    90
  | |
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    91
  | o  1 (v0) init files:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    92
  |/
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    93
  o  0 () Initial revision files: a b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    94
  
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    95
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    96
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    97
issue 1447
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
    98
12520
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
    99
  $ cvscall()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   100
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   101
  >     cvs -f "$@" > /dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   102
  >     sleep 1
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
  $ cvsci()
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   105
  > {
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   106
  >     cvs -f ci "$@" >/dev/null
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   107
  >     sleep 1
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
  $ cvscall -Q -d `pwd`/cvsmaster2 init
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   110
  $ cd cvsmaster2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   111
  $ CVSROOT=`pwd`
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   112
  $ export CVSROOT
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   113
  $ mkdir foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   114
  $ cd ..
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   115
  $ cvscall -Q co -d cvswork2 foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   116
  $ cd cvswork2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   117
  $ echo foo > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   118
  $ echo bar > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   119
  $ cvscall -Q add a.txt b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   120
  $ cvsci -m "Initial commit"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   121
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   122
  $ echo foo > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   123
  $ cvsci -m "Fix b on HEAD"
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 bar > a.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   126
  $ cvsci -m "Small fix in a 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
  $ cvscall -Q tag -b BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   129
  $ cvscall -Q up -P -rBRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   130
  $ echo baz > b.txt
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   131
  $ cvsci -m "Change on BRANCH in b"
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   132
  cvs commit: Examining .
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   133
  $ hg debugcvsps -x --parents foo
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   134
  collecting CVS rlog
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   135
  5 log entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   136
  creating changesets
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   137
  4 changeset entries
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   138
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   139
  PatchSet 1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   140
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   141
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   142
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   143
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   144
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   145
  Initial commit
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   146
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   147
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   148
  	a.txt:INITIAL->1.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   149
  	b.txt:INITIAL->1.1 
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
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   152
  PatchSet 2 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   153
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   154
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   155
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   156
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   157
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   158
  Parent: 1
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   159
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   160
  Fix b on HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   161
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   162
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   163
  	b.txt:1.1->1.2 
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
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   166
  PatchSet 3 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   167
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   168
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   169
  Branch: HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   170
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   171
  Branchpoints: BRANCH 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   172
  Parent: 2
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   173
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   174
  Small fix in a on HEAD
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   175
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   176
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   177
  	a.txt:1.1->1.2 
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
  ---------------------
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   180
  PatchSet 4 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   181
  Date: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   182
  Author: * (glob)
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   183
  Branch: BRANCH
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   184
  Tag: (none) 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   185
  Parent: 3
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   186
  Log:
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   187
  Change on BRANCH in b
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   188
  
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   189
  Members: 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   190
  	b.txt:1.2->1.2.2.1 
873ca83d6cfd tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
   191
  
8756
6019e6517f95 convert: better support for CVS branchpoints (issue1447)
Henrik Stuart <hg@hstuart.dk>
parents: 8523
diff changeset
   192