annotate tests/test-convert-p4-filetypes.t @ 48548:88a45330b290

simplemerge: rewrite `merge_lines()` using `merge_groups()` Simple is better. Differential Revision: https://phab.mercurial-scm.org/D11967
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Jan 2022 11:34:54 -0800
parents 5abc47d4ca6b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 16673
diff changeset
1 #require p4 execbit symlink
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
3 $ echo "[extensions]" >> $HGRCPATH
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
4 $ echo "convert = " >> $HGRCPATH
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
5
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
6 create p4 depot
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
7 $ P4ROOT=`pwd`/depot; export P4ROOT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
8 $ P4AUDIT=$P4ROOT/audit; export P4AUDIT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
9 $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
10 $ P4LOG=$P4ROOT/log; export P4LOG
22293
a970a5c15b43 tests: fix p4 tests so they use separate ports and can be run in parallel
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
11 $ P4PORT=localhost:$HGPORT; export P4PORT
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
12 $ P4DEBUG=1; export P4DEBUG
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
13 $ P4CHARSET=utf8; export P4CHARSET
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
14
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
15 start the p4 server
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
16 $ [ ! -d $P4ROOT ] && mkdir $P4ROOT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
17 $ p4d -f -J off -xi >$P4ROOT/stdout 2>$P4ROOT/stderr
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
18 $ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
19 $ echo $! >> $DAEMON_PIDS
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
20 $ trap "echo stopping the p4 server ; p4 admin stop" EXIT
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
21
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
22 wait for the server to initialize
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
23 $ while ! p4 ; do
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
24 > sleep 1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
25 > done >/dev/null 2>/dev/null
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
26
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
27 create a client spec
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
28 $ P4CLIENT=hg-p4-import; export P4CLIENT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
29 $ DEPOTPATH=//depot/test-mercurial-import/...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
30 $ p4 client -o | sed '/^View:/,$ d' >p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
31 $ echo View: >>p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
32 $ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
33 $ p4 client -i <p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
34 Client hg-p4-import saved.
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
35
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
36 populate the depot
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
37 $ TYPES="text binary symlink"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
38 $ TYPES="$TYPES text+m text+w text+x text+k text+kx text+ko text+l text+C text+D text+F text+S text+S2"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
39 $ TYPES="$TYPES binary+k binary+x binary+kx symlink+k"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
40 $ TYPES="$TYPES ctext cxtext ktext kxtext ltext tempobj ubinary uxbinary xbinary xltext xtempobj xtext"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
41 not testing these
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
42 $ #TYPES="$TYPES apple resource unicode utf16 uresource xunicode xutf16"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
43 $ for T in $TYPES ; do
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
44 > T2=`echo $T | tr [:upper:] [:lower:]`
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
45 > case $T in
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
46 > apple)
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
47 > ;;
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
48 > symlink*)
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
49 > echo "this is target $T" >target_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
50 > ln -s target_$T file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
51 > p4 add target_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
52 > p4 add -t $T file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
53 > ;;
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
54 > binary*)
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 36013
diff changeset
55 > "$PYTHON" -c "open('file_$T2', 'wb').write(b'this is $T')"
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
56 > p4 add -t $T file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
57 > ;;
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
58 > *)
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
59 > echo "this is $T" >file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
60 > p4 add -t $T file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
61 > ;;
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
62 > esac
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
63 > done
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
64 //depot/test-mercurial-import/file_text#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
65 //depot/test-mercurial-import/file_binary#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
66 //depot/test-mercurial-import/target_symlink#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
67 //depot/test-mercurial-import/file_symlink#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
68 //depot/test-mercurial-import/file_text+m#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
69 //depot/test-mercurial-import/file_text+w#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
70 //depot/test-mercurial-import/file_text+x#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
71 //depot/test-mercurial-import/file_text+k#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
72 //depot/test-mercurial-import/file_text+kx#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
73 //depot/test-mercurial-import/file_text+ko#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
74 //depot/test-mercurial-import/file_text+l#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
75 //depot/test-mercurial-import/file_text+c#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
76 //depot/test-mercurial-import/file_text+d#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
77 //depot/test-mercurial-import/file_text+f#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
78 //depot/test-mercurial-import/file_text+s#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
79 //depot/test-mercurial-import/file_text+s2#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
80 //depot/test-mercurial-import/file_binary+k#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
81 //depot/test-mercurial-import/file_binary+x#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
82 //depot/test-mercurial-import/file_binary+kx#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
83 //depot/test-mercurial-import/target_symlink+k#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
84 //depot/test-mercurial-import/file_symlink+k#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
85 //depot/test-mercurial-import/file_ctext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
86 //depot/test-mercurial-import/file_cxtext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
87 //depot/test-mercurial-import/file_ktext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
88 //depot/test-mercurial-import/file_kxtext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
89 //depot/test-mercurial-import/file_ltext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
90 //depot/test-mercurial-import/file_tempobj#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
91 //depot/test-mercurial-import/file_ubinary#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
92 //depot/test-mercurial-import/file_uxbinary#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
93 //depot/test-mercurial-import/file_xbinary#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
94 //depot/test-mercurial-import/file_xltext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
95 //depot/test-mercurial-import/file_xtempobj#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
96 //depot/test-mercurial-import/file_xtext#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
97 $ p4 submit -d initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
98 Submitting change 1.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
99 Locking 33 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
100 add //depot/test-mercurial-import/file_binary#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
101 add //depot/test-mercurial-import/file_binary+k#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
102 add //depot/test-mercurial-import/file_binary+kx#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
103 add //depot/test-mercurial-import/file_binary+x#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
104 add //depot/test-mercurial-import/file_ctext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
105 add //depot/test-mercurial-import/file_cxtext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
106 add //depot/test-mercurial-import/file_ktext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
107 add //depot/test-mercurial-import/file_kxtext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
108 add //depot/test-mercurial-import/file_ltext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
109 add //depot/test-mercurial-import/file_symlink#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
110 add //depot/test-mercurial-import/file_symlink+k#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
111 add //depot/test-mercurial-import/file_tempobj#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
112 add //depot/test-mercurial-import/file_text#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
113 add //depot/test-mercurial-import/file_text+c#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
114 add //depot/test-mercurial-import/file_text+d#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
115 add //depot/test-mercurial-import/file_text+f#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
116 add //depot/test-mercurial-import/file_text+k#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
117 add //depot/test-mercurial-import/file_text+ko#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
118 add //depot/test-mercurial-import/file_text+kx#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
119 add //depot/test-mercurial-import/file_text+l#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
120 add //depot/test-mercurial-import/file_text+m#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
121 add //depot/test-mercurial-import/file_text+s#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
122 add //depot/test-mercurial-import/file_text+s2#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
123 add //depot/test-mercurial-import/file_text+w#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
124 add //depot/test-mercurial-import/file_text+x#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
125 add //depot/test-mercurial-import/file_ubinary#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
126 add //depot/test-mercurial-import/file_uxbinary#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
127 add //depot/test-mercurial-import/file_xbinary#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
128 add //depot/test-mercurial-import/file_xltext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
129 add //depot/test-mercurial-import/file_xtempobj#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
130 add //depot/test-mercurial-import/file_xtext#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
131 add //depot/test-mercurial-import/target_symlink#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
132 add //depot/test-mercurial-import/target_symlink+k#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
133 Change 1 submitted.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
134 //depot/test-mercurial-import/file_binary+k#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
135 //depot/test-mercurial-import/file_binary+kx#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
136 //depot/test-mercurial-import/file_ktext#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
137 //depot/test-mercurial-import/file_kxtext#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
138 //depot/test-mercurial-import/file_symlink+k#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
139 //depot/test-mercurial-import/file_text+k#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
140 //depot/test-mercurial-import/file_text+ko#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
141 //depot/test-mercurial-import/file_text+kx#1 - refreshing
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
142
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
143 test keyword expansion
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
144 $ p4 edit file_* target_*
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
145 //depot/test-mercurial-import/file_binary#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
146 //depot/test-mercurial-import/file_binary+k#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
147 //depot/test-mercurial-import/file_binary+kx#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
148 //depot/test-mercurial-import/file_binary+x#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
149 //depot/test-mercurial-import/file_ctext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
150 //depot/test-mercurial-import/file_cxtext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
151 //depot/test-mercurial-import/file_ktext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
152 //depot/test-mercurial-import/file_kxtext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
153 //depot/test-mercurial-import/file_ltext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
154 //depot/test-mercurial-import/file_symlink#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
155 //depot/test-mercurial-import/file_symlink+k#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
156 //depot/test-mercurial-import/file_tempobj#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
157 //depot/test-mercurial-import/file_text#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
158 //depot/test-mercurial-import/file_text+c#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
159 //depot/test-mercurial-import/file_text+d#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
160 //depot/test-mercurial-import/file_text+f#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
161 //depot/test-mercurial-import/file_text+k#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
162 //depot/test-mercurial-import/file_text+ko#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
163 //depot/test-mercurial-import/file_text+kx#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
164 //depot/test-mercurial-import/file_text+l#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
165 //depot/test-mercurial-import/file_text+m#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
166 //depot/test-mercurial-import/file_text+s#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
167 //depot/test-mercurial-import/file_text+s2#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
168 //depot/test-mercurial-import/file_text+w#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
169 //depot/test-mercurial-import/file_text+x#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
170 //depot/test-mercurial-import/file_ubinary#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
171 //depot/test-mercurial-import/file_uxbinary#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
172 //depot/test-mercurial-import/file_xbinary#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
173 //depot/test-mercurial-import/file_xltext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
174 //depot/test-mercurial-import/file_xtempobj#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
175 //depot/test-mercurial-import/file_xtext#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
176 //depot/test-mercurial-import/target_symlink#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
177 //depot/test-mercurial-import/target_symlink+k#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
178 $ for T in $TYPES ; do
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
179 > T2=`echo $T | tr [:upper:] [:lower:]`
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
180 > echo '$Id$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
181 > echo '$Header$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
182 > echo '$Date$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
183 > echo '$DateTime$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
184 > echo '$Change$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
185 > echo '$File$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
186 > echo '$Revision$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
187 > echo '$Header$$Header$Header$' >>file_$T2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
188 > done
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
189
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
190 $ ln -s 'target_$Header$' crazy_symlink+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
191 $ p4 add -t symlink+k crazy_symlink+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
192 //depot/test-mercurial-import/crazy_symlink+k#1 - opened for add
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
193
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
194 $ p4 submit -d keywords
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
195 Submitting change 2.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
196 Locking 34 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
197 add //depot/test-mercurial-import/crazy_symlink+k#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
198 edit //depot/test-mercurial-import/file_binary#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
199 edit //depot/test-mercurial-import/file_binary+k#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
200 edit //depot/test-mercurial-import/file_binary+kx#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
201 edit //depot/test-mercurial-import/file_binary+x#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
202 edit //depot/test-mercurial-import/file_ctext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
203 edit //depot/test-mercurial-import/file_cxtext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
204 edit //depot/test-mercurial-import/file_ktext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
205 edit //depot/test-mercurial-import/file_kxtext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
206 edit //depot/test-mercurial-import/file_ltext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
207 edit //depot/test-mercurial-import/file_symlink#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
208 edit //depot/test-mercurial-import/file_symlink+k#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
209 edit //depot/test-mercurial-import/file_tempobj#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
210 edit //depot/test-mercurial-import/file_text#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
211 edit //depot/test-mercurial-import/file_text+c#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
212 edit //depot/test-mercurial-import/file_text+d#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
213 edit //depot/test-mercurial-import/file_text+f#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
214 edit //depot/test-mercurial-import/file_text+k#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
215 edit //depot/test-mercurial-import/file_text+ko#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
216 edit //depot/test-mercurial-import/file_text+kx#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
217 edit //depot/test-mercurial-import/file_text+l#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
218 edit //depot/test-mercurial-import/file_text+m#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
219 edit //depot/test-mercurial-import/file_text+s#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
220 edit //depot/test-mercurial-import/file_text+s2#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
221 edit //depot/test-mercurial-import/file_text+w#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
222 edit //depot/test-mercurial-import/file_text+x#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
223 edit //depot/test-mercurial-import/file_ubinary#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
224 edit //depot/test-mercurial-import/file_uxbinary#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
225 edit //depot/test-mercurial-import/file_xbinary#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
226 edit //depot/test-mercurial-import/file_xltext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
227 edit //depot/test-mercurial-import/file_xtempobj#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
228 edit //depot/test-mercurial-import/file_xtext#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
229 edit //depot/test-mercurial-import/target_symlink#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
230 edit //depot/test-mercurial-import/target_symlink+k#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
231 Change 2 submitted.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
232 //depot/test-mercurial-import/crazy_symlink+k#1 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
233 //depot/test-mercurial-import/file_binary+k#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
234 //depot/test-mercurial-import/file_binary+kx#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
235 //depot/test-mercurial-import/file_ktext#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
236 //depot/test-mercurial-import/file_kxtext#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
237 //depot/test-mercurial-import/file_symlink+k#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
238 //depot/test-mercurial-import/file_text+k#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
239 //depot/test-mercurial-import/file_text+ko#2 - refreshing
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
240 //depot/test-mercurial-import/file_text+kx#2 - refreshing
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
241
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
242 check keywords in p4
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
243 $ grep -H Header file_*
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
244 file_binary:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
245 file_binary:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
246 file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
247 file_binary+k:$Header: //depot/test-mercurial-import/file_binary+k#2 $$Header: //depot/test-mercurial-import/file_binary+k#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
248 file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
249 file_binary+kx:$Header: //depot/test-mercurial-import/file_binary+kx#2 $$Header: //depot/test-mercurial-import/file_binary+kx#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
250 file_binary+x:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
251 file_binary+x:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
252 file_ctext:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
253 file_ctext:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
254 file_cxtext:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
255 file_cxtext:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
256 file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
257 file_ktext:$Header: //depot/test-mercurial-import/file_ktext#2 $$Header: //depot/test-mercurial-import/file_ktext#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
258 file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
259 file_kxtext:$Header: //depot/test-mercurial-import/file_kxtext#2 $$Header: //depot/test-mercurial-import/file_kxtext#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
260 file_ltext:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
261 file_ltext:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
262 file_symlink:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
263 file_symlink:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
264 file_symlink+k:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
265 file_symlink+k:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
266 file_tempobj:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
267 file_tempobj:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
268 file_text:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
269 file_text:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
270 file_text+c:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
271 file_text+c:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
272 file_text+d:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
273 file_text+d:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
274 file_text+f:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
275 file_text+f:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
276 file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
277 file_text+k:$Header: //depot/test-mercurial-import/file_text+k#2 $$Header: //depot/test-mercurial-import/file_text+k#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
278 file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
279 file_text+ko:$Header: //depot/test-mercurial-import/file_text+ko#2 $$Header: //depot/test-mercurial-import/file_text+ko#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
280 file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
281 file_text+kx:$Header: //depot/test-mercurial-import/file_text+kx#2 $$Header: //depot/test-mercurial-import/file_text+kx#2 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
282 file_text+l:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
283 file_text+l:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
284 file_text+m:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
285 file_text+m:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
286 file_text+s:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
287 file_text+s:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
288 file_text+s2:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
289 file_text+s2:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
290 file_text+w:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
291 file_text+w:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
292 file_text+x:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
293 file_text+x:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
294 file_ubinary:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
295 file_ubinary:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
296 file_uxbinary:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
297 file_uxbinary:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
298 file_xbinary:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
299 file_xbinary:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
300 file_xltext:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
301 file_xltext:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
302 file_xtempobj:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
303 file_xtempobj:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
304 file_xtext:$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
305 file_xtext:$Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
306
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
307 convert
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
308 $ hg convert -s p4 $DEPOTPATH dst
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
309 initializing destination dst repository
30632
1d0e4832e616 convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents: 28639
diff changeset
310 scanning source...
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
311 reading p4 views
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
312 collecting p4 changelists
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
313 1 initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
314 2 keywords
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
315 sorting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
316 converting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
317 1 initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
318 0 keywords
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
319 $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
28639
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
320 rev=1 desc="keywords" tags="tip" files="crazy_symlink+k file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_tempobj file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtempobj file_xtext target_symlink target_symlink+k"
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
321 rev=0 desc="initial" tags="" files="file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_symlink file_symlink+k file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtext target_symlink target_symlink+k"
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
322
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
323 revision 0
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
324 $ hg -R dst update 0
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
325 30 files updated, 0 files merged, 0 files removed, 0 files unresolved
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
326 $ head dst/file_* | cat -v
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
327 ==> dst/file_binary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
328 this is binary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
329 ==> dst/file_binary+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
330 this is binary+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
331 ==> dst/file_binary+kx <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
332 this is binary+kx
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
333 ==> dst/file_binary+x <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
334 this is binary+x
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
335 ==> dst/file_ctext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
336 this is ctext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
337
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
338 ==> dst/file_cxtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
339 this is cxtext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
340
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
341 ==> dst/file_ktext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
342 this is ktext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
343
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
344 ==> dst/file_kxtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
345 this is kxtext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
346
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
347 ==> dst/file_ltext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
348 this is ltext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
349
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
350 ==> dst/file_symlink <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
351 this is target symlink
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
352
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
353 ==> dst/file_symlink+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
354 this is target symlink+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
355
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
356 ==> dst/file_text <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
357 this is text
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
358
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
359 ==> dst/file_text+c <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
360 this is text+C
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
361
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
362 ==> dst/file_text+d <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
363 this is text+D
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
364
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
365 ==> dst/file_text+f <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
366 this is text+F
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
367
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
368 ==> dst/file_text+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
369 this is text+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
370
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
371 ==> dst/file_text+ko <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
372 this is text+ko
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
373
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
374 ==> dst/file_text+kx <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
375 this is text+kx
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
376
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
377 ==> dst/file_text+l <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
378 this is text+l
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
379
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
380 ==> dst/file_text+m <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
381 this is text+m
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
382
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
383 ==> dst/file_text+s2 <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
384 this is text+S2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
385
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
386 ==> dst/file_text+w <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
387 this is text+w
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
388
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
389 ==> dst/file_text+x <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
390 this is text+x
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
391
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
392 ==> dst/file_ubinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
393 this is ubinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
394
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
395 ==> dst/file_uxbinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
396 this is uxbinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
397
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
398 ==> dst/file_xbinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
399 this is xbinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
400
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
401 ==> dst/file_xltext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
402 this is xltext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
403
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
404 ==> dst/file_xtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
405 this is xtext
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
406
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
407 revision 1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
408 $ hg -R dst update 1
28639
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
409 32 files updated, 0 files merged, 0 files removed, 0 files unresolved
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
410 $ head dst/file_* | cat -v
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
411 ==> dst/file_binary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
412 this is binary$Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
413 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
414 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
415 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
416 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
417 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
418 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
419 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
420
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
421 ==> dst/file_binary+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
422 this is binary+k$Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
423 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
424 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
425 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
426 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
427 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
428 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
429 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
430
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
431 ==> dst/file_binary+kx <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
432 this is binary+kx$Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
433 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
434 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
435 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
436 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
437 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
438 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
439 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
440
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
441 ==> dst/file_binary+x <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
442 this is binary+x$Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
443 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
444 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
445 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
446 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
447 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
448 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
449 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
450
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
451 ==> dst/file_ctext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
452 this is ctext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
453 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
454 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
455 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
456 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
457 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
458 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
459 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
460 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
461
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
462 ==> dst/file_cxtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
463 this is cxtext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
464 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
465 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
466 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
467 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
468 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
469 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
470 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
471 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
472
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
473 ==> dst/file_ktext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
474 this is ktext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
475 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
476 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
477 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
478 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
479 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
480 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
481 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
482 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
483
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
484 ==> dst/file_kxtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
485 this is kxtext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
486 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
487 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
488 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
489 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
490 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
491 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
492 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
493 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
494
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
495 ==> dst/file_ltext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
496 this is ltext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
497 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
498 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
499 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
500 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
501 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
502 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
503 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
504 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
505
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
506 ==> dst/file_symlink <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
507 this is target symlink
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
508 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
509 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
510 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
511 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
512 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
513 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
514 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
515 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
516
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
517 ==> dst/file_symlink+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
518 this is target symlink+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
519 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
520 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
521 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
522 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
523 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
524 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
525 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
526 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
527
28639
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
528 ==> dst/file_tempobj <==
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
529 this is tempobj
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
530 $Id$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
531 $Header$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
532 $Date$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
533 $DateTime$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
534 $Change$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
535 $File$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
536 $Revision$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
537 $Header$$Header$Header$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
538
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
539 ==> dst/file_text <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
540 this is text
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
541 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
542 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
543 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
544 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
545 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
546 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
547 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
548 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
549
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
550 ==> dst/file_text+c <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
551 this is text+C
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
552 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
553 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
554 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
555 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
556 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
557 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
558 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
559 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
560
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
561 ==> dst/file_text+d <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
562 this is text+D
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
563 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
564 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
565 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
566 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
567 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
568 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
569 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
570 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
571
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
572 ==> dst/file_text+f <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
573 this is text+F
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
574 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
575 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
576 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
577 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
578 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
579 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
580 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
581 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
582
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
583 ==> dst/file_text+k <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
584 this is text+k
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
585 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
586 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
587 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
588 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
589 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
590 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
591 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
592 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
593
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
594 ==> dst/file_text+ko <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
595 this is text+ko
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
596 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
597 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
598 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
599 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
600 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
601 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
602 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
603 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
604
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
605 ==> dst/file_text+kx <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
606 this is text+kx
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
607 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
608 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
609 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
610 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
611 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
612 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
613 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
614 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
615
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
616 ==> dst/file_text+l <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
617 this is text+l
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
618 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
619 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
620 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
621 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
622 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
623 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
624 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
625 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
626
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
627 ==> dst/file_text+m <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
628 this is text+m
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
629 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
630 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
631 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
632 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
633 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
634 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
635 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
636 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
637
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
638 ==> dst/file_text+s <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
639 this is text+S
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
640 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
641 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
642 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
643 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
644 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
645 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
646 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
647 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
648
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
649 ==> dst/file_text+s2 <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
650 this is text+S2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
651 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
652 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
653 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
654 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
655 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
656 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
657 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
658 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
659
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
660 ==> dst/file_text+w <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
661 this is text+w
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
662 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
663 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
664 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
665 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
666 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
667 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
668 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
669 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
670
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
671 ==> dst/file_text+x <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
672 this is text+x
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
673 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
674 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
675 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
676 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
677 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
678 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
679 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
680 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
681
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
682 ==> dst/file_ubinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
683 this is ubinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
684 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
685 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
686 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
687 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
688 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
689 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
690 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
691 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
692
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
693 ==> dst/file_uxbinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
694 this is uxbinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
695 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
696 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
697 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
698 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
699 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
700 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
701 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
702 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
703
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
704 ==> dst/file_xbinary <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
705 this is xbinary
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
706 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
707 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
708 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
709 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
710 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
711 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
712 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
713 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
714
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
715 ==> dst/file_xltext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
716 this is xltext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
717 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
718 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
719 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
720 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
721 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
722 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
723 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
724 $Header$$Header$Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
725
28639
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
726 ==> dst/file_xtempobj <==
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
727 this is xtempobj
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
728 $Id$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
729 $Header$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
730 $Date$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
731 $DateTime$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
732 $Change$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
733 $File$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
734 $Revision$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
735 $Header$$Header$Header$
64ed9f904532 tests: fix for failure of test-convert-p4-filetypes.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
736
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
737 ==> dst/file_xtext <==
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
738 this is xtext
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
739 $Id$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
740 $Header$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
741 $Date$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
742 $DateTime$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
743 $Change$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
744 $File$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
745 $Revision$
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
746 $Header$$Header$Header$
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
747
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
748 crazy_symlink
34569
e304fd82c718 tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents: 30632
diff changeset
749 $ readlink.py crazy_symlink+k
e304fd82c718 tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents: 30632
diff changeset
750 crazy_symlink+k -> target_$Header: //depot/test-mercurial-import/crazy_symlink+k#1 $
e304fd82c718 tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents: 30632
diff changeset
751 $ readlink.py dst/crazy_symlink+k
e304fd82c718 tests: use readlink.py instead of readlink
Augie Fackler <augie@google.com>
parents: 30632
diff changeset
752 dst/crazy_symlink+k -> target_$Header$
8829
ce4b92f5cea7 convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
753
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
754 exit trap:
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 16497
diff changeset
755 stopping the p4 server