annotate tests/test-convert-svn-sink.t @ 52293:77b38c86915d

ci: add a small script one can run to purge older pipeline We have over ten thousands old pipeline that take a huge space and that I suspect to be the source of some slowdown in merge request. However it seems that the only way to clear them is manually and through the API, so lets do it. The script was run today.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 12 Nov 2024 12:45:23 +0100
parents 7525e77b5eac
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: 21947
diff changeset
1 #require svn13
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
3 $ svnupanddisplay()
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
4 > {
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
5 > (
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
6 > cd $1;
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
7 > svn up -q;
17033
0413f68da85c tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
8 > svn st -v | sed 's/ */ /g' | sort
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
9 > limit=''
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
10 > if [ $2 -gt 0 ]; then
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
11 > limit="--limit=$2"
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
12 > fi
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 35704
diff changeset
13 > svn log --xml -v $limit | "$PYTHON" "$TESTDIR/svnxml.py"
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
14 > )
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
15 > }
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16
13519
43b3b761d9d1 tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents: 12370
diff changeset
17 $ cat >> $HGRCPATH <<EOF
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
18 > [extensions]
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 17044
diff changeset
19 > convert =
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
20 > EOF
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
21
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
22 $ hg init a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
23
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
24 Add
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
25
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
26 $ echo a > a/a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
27 $ mkdir -p a/d1/d2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
28 $ echo b > a/d1/d2/b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
29 $ hg --cwd a ci -d '0 0' -A -m 'add a file'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
30 adding a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
31 adding d1/d2/b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
32
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
33 Modify
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
34
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 23835
diff changeset
35 $ svn-safe-append.py a a/a
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
36 $ hg --cwd a ci -d '1 0' -m 'modify a file'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
37 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
38 1:e0e2b8a9156b
5808
80e40ef3d8b8 test-convert-svn-sink: wrap repetitive svn checks in a function
Patrick Mezard <pmezard@gmail.com>
parents: 5698
diff changeset
39
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
40 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
41 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
42 initializing svn repository 'a-hg'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
43 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
44 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
45 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
46 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
47 1 add a file
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
48 0 modify a file
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
49 $ svnupanddisplay a-hg-wc 2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
50 2 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
51 2 1 test d1/d2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
52 2 1 test d1/d2/b
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
53 2 2 test .
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
54 2 2 test a
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
55 revision: 2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
56 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
57 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
58 msg: modify a file
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
59 M /a
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
60 revision: 1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
61 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
62 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
63 msg: add a file
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
64 A /a
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
65 A /d1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
66 A /d1/d2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
67 A /d1/d2/b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
68 $ ls a a-hg-wc
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
69 a:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
70 a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
71 d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
72
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
73 a-hg-wc:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
74 a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
75 d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
76 $ cmp a/a a-hg-wc/a
5808
80e40ef3d8b8 test-convert-svn-sink: wrap repetitive svn checks in a function
Patrick Mezard <pmezard@gmail.com>
parents: 5698
diff changeset
77
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
78 Rename
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
79
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
80 $ hg --cwd a mv a b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
81 $ hg --cwd a ci -d '2 0' -m 'rename a file'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
82 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
83 2:eb5169441d43
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
84
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
85 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
86 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
87 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
88 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
89 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
90 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
91 0 rename a file
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
92 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
93 3 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
94 3 1 test d1/d2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
95 3 1 test d1/d2/b
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
96 3 3 test .
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
97 3 3 test b
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
98 revision: 3
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
99 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
100 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
101 msg: rename a file
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
102 D /a
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
103 A /b (from /a@2)
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
104 $ ls a a-hg-wc
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
105 a:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
106 b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
107 d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
108
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
109 a-hg-wc:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
110 b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
111 d1
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
112
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
113 Copy
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
114
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
115 $ hg --cwd a cp b c
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
116
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
117 $ hg --cwd a ci -d '3 0' -m 'copy a file'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
118 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
119 3:60effef6ab48
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
120
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
121 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
122 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
123 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
124 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
125 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
126 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
127 0 copy a file
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
128 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
129 4 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
130 4 1 test d1/d2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
131 4 1 test d1/d2/b
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
132 4 3 test b
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
133 4 4 test .
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
134 4 4 test c
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
135 revision: 4
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
136 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
137 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
138 msg: copy a file
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
139 A /c (from /b@3)
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
140 $ ls a a-hg-wc
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
141 a:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
142 b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
143 c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
144 d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
145
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
146 a-hg-wc:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
147 b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
148 c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
149 d1
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
150
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
151 $ hg --cwd a rm b
15243
1e9451476bf8 tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents: 13530
diff changeset
152
1e9451476bf8 tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents: 13530
diff changeset
153 Remove
1e9451476bf8 tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents: 13530
diff changeset
154
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
155 $ hg --cwd a ci -d '4 0' -m 'remove a file'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
156 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
157 4:87bbe3013fb6
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
158
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
159 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
160 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
161 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
162 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
163 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
164 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
165 0 remove a file
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
166 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
167 5 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
168 5 1 test d1/d2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
169 5 1 test d1/d2/b
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
170 5 4 test c
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
171 5 5 test .
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
172 revision: 5
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
173 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
174 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
175 msg: remove a file
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
176 D /b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
177 $ ls a a-hg-wc
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
178 a:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
179 c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
180 d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
181
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
182 a-hg-wc:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
183 c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
184 d1
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
185
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
186 Executable
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
187
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
188 #if execbit
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
189 $ chmod +x a/c
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
190 #else
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
191 $ echo fake >> a/c
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
192 #endif
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
193 $ hg --cwd a ci -d '5 0' -m 'make a file executable'
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
194 #if execbit
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
195 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
196 5:ff42e473c340
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
197 #else
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
198 $ hg --cwd a tip -q
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
199 5:817a700c8cf1
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
200 #endif
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
201
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
202 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
203 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
204 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
205 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
206 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
207 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
208 0 make a file executable
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
209 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
210 6 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
211 6 1 test d1/d2
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
212 6 1 test d1/d2/b
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
213 6 6 test .
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
214 6 6 test c
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
215 revision: 6
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
216 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
217 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
218 msg: make a file executable
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
219 M /c
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
220 #if execbit
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
221 $ test -x a-hg-wc/c
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
222 #endif
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
223
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
224 #if symlink
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
225
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
226 Symlinks
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
227
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
228 $ ln -s a/missing a/link
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
229 $ hg --cwd a commit -Am 'add symlink'
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
230 adding link
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
231 $ hg --cwd a mv link newlink
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
232 $ hg --cwd a commit -m 'move symlink'
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
233 $ hg convert -d svn a a-svnlink
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
234 initializing svn repository 'a-svnlink'
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
235 initializing svn working copy 'a-svnlink-wc'
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
236 scanning source...
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
237 sorting...
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
238 converting...
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
239 7 add a file
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
240 6 modify a file
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
241 5 rename a file
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
242 4 copy a file
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
243 3 remove a file
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
244 2 make a file executable
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
245 1 add symlink
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
246 0 move symlink
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
247 $ svnupanddisplay a-svnlink-wc 1
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
248 8 1 test d1
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
249 8 1 test d1/d2
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
250 8 1 test d1/d2/b
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
251 8 6 test c
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
252 8 8 test .
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
253 8 8 test newlink
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
254 revision: 8
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
255 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
256 date: * (glob)
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
257 msg: move symlink
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
258 D /link
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
259 A /newlink (from /link@7)
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
260
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
261 Make sure our changes don't affect the rest of the test cases
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
262
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
263 $ hg --cwd a up 5
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
264 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
265 $ hg --cwd a --config extensions.strip= strip -r 6
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
266 saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
267
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
268 #endif
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
269
22300
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
270 Convert with --full adds and removes files that didn't change
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
271
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
272 $ touch a/f
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
273 $ hg -R a ci -Aqmf
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
274 $ echo "rename c d" > filemap
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
275 $ hg convert -d svn a --filemap filemap --full
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
276 assuming destination a-hg
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
277 initializing svn working copy 'a-hg-wc'
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
278 scanning source...
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
279 sorting...
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
280 converting...
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
281 0 f
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
282 $ svnupanddisplay a-hg-wc 1
23098
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
283 7 7 test .
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
284 7 7 test d
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
285 7 7 test f
675e415568af test-convert-svn-sink: properly isolate symlink section
Matt Mackall <mpm@selenic.com>
parents: 22300
diff changeset
286 revision: 7
22300
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
287 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
288 date: * (glob)
22300
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
289 msg: f
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
290 D /c
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
291 A /d
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
292 D /d1
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
293 A /f
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
294
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
295 $ rm -rf a a-hg a-hg-wc
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
296
16909
b6fd2f8909ff tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
297
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
298 Executable in new directory
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
299
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
300 $ hg init a
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
301
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
302 $ mkdir a/d1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
303 $ echo a > a/d1/a
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
304 #if execbit
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
305 $ chmod +x a/d1/a
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
306 #else
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
307 $ echo fake >> a/d1/a
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
308 #endif
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
309 $ hg --cwd a ci -d '0 0' -A -m 'add executable file in new directory'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
310 adding d1/a
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
311
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
312 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
313 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
314 initializing svn repository 'a-hg'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
315 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
316 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
317 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
318 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
319 0 add executable file in new directory
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
320 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
321 1 1 test .
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
322 1 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
323 1 1 test d1/a
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
324 revision: 1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
325 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
326 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
327 msg: add executable file in new directory
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
328 A /d1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
329 A /d1/a
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
330 #if execbit
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
331 $ test -x a-hg-wc/d1/a
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16512
diff changeset
332 #endif
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
333
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
334 Copy to new directory
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
335
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
336 $ mkdir a/d2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
337 $ hg --cwd a cp d1/a d2/a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
338 $ hg --cwd a ci -d '1 0' -A -m 'copy file to new directory'
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
339
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
340 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
341 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
342 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
343 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
344 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
345 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
346 0 copy file to new directory
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
347 $ svnupanddisplay a-hg-wc 1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
348 2 1 test d1
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
349 2 1 test d1/a
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
350 2 2 test .
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
351 2 2 test d2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 32940
diff changeset
352 2 2 test d2/a
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
353 revision: 2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
354 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
355 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
356 msg: copy file to new directory
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
357 A /d2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
358 A /d2/a (from /d1/a@1)
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
359
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
360 Branchy history
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
361
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
362 $ hg init b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
363 $ echo base > b/b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
364 $ hg --cwd b ci -d '0 0' -Ambase
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
365 adding b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
366
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 23835
diff changeset
367 $ svn-safe-append.py left-1 b/b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
368 $ echo left-1 > b/left-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
369 $ hg --cwd b ci -d '1 0' -Amleft-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
370 adding left-1
5698
b63ef7b1441c convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents: 5538
diff changeset
371
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 23835
diff changeset
372 $ svn-safe-append.py left-2 b/b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
373 $ echo left-2 > b/left-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
374 $ hg --cwd b ci -d '2 0' -Amleft-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
375 adding left-2
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
376
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
377 $ hg --cwd b up 0
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
378 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
379
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 23835
diff changeset
380 $ svn-safe-append.py right-1 b/b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
381 $ echo right-1 > b/right-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
382 $ hg --cwd b ci -d '3 0' -Amright-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
383 adding right-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
384 created new head
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
385
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 23835
diff changeset
386 $ svn-safe-append.py right-2 b/b
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
387 $ echo right-2 > b/right-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
388 $ hg --cwd b ci -d '4 0' -Amright-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
389 adding right-2
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
390
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
391 $ hg --cwd b up -C 2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
392 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
393 $ hg --cwd b merge
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
394 merging b
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 25472
diff changeset
395 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
396 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
397 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
398 [1]
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
399 $ hg --cwd b revert -r 2 b
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16909
diff changeset
400 $ hg --cwd b resolve -m b
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21267
diff changeset
401 (no more unresolved files)
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
402 $ hg --cwd b ci -d '5 0' -m 'merge'
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
403
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
404 Expect 4 changes
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
405
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
406 $ hg convert -d svn b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
407 assuming destination b-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
408 initializing svn repository 'b-hg'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
409 initializing svn working copy 'b-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
410 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
411 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
412 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
413 5 base
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
414 4 left-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
415 3 left-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
416 2 right-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
417 1 right-2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
418 0 merge
5513
f0c58fd4b798 convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
419
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
420 $ svnupanddisplay b-hg-wc 0
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
421 4 2 test left-1
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
422 4 3 test b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
423 4 3 test left-2
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
424 4 4 test .
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
425 4 4 test right-1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
426 4 4 test right-2
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
427 revision: 4
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
428 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
429 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
430 msg: merge
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
431 A /right-1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
432 A /right-2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
433 revision: 3
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
434 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
435 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
436 msg: left-2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
437 M /b
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
438 A /left-2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
439 revision: 2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
440 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
441 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
442 msg: left-1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
443 M /b
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
444 A /left-1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
445 revision: 1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
446 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
447 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
448 msg: base
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
449 A /b
11835
14db59e3b248 convert: Test svn sink for a repo with tags.
Daniel J. Lauk <daniel.lauk@gmail.com>
parents: 8049
diff changeset
450
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
451 Tags are not supported, but must not break conversion
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
452
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
453 $ rm -rf a a-hg a-hg-wc
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
454 $ hg init a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
455 $ echo a > a/a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
456 $ hg --cwd a ci -d '0 0' -A -m 'Add file a'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
457 adding a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
458 $ hg --cwd a tag -d '1 0' -m 'Tagged as v1.0' v1.0
11835
14db59e3b248 convert: Test svn sink for a repo with tags.
Daniel J. Lauk <daniel.lauk@gmail.com>
parents: 8049
diff changeset
459
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
460 $ hg convert -d svn a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
461 assuming destination a-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
462 initializing svn repository 'a-hg'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
463 initializing svn working copy 'a-hg-wc'
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
464 scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
465 sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
466 converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
467 1 Add file a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
468 0 Tagged as v1.0
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
469 writing Subversion tags is not yet implemented
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
470 $ svnupanddisplay a-hg-wc 2
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
471 2 1 test a
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
472 2 2 test .
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
473 2 2 test .hgtags
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
474 revision: 2
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
475 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
476 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
477 msg: Tagged as v1.0
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
478 A /.hgtags
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
479 revision: 1
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
480 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
481 date: * (glob)
16512
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
482 msg: Add file a
c58bdecdb800 test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents: 15501
diff changeset
483 A /a
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12343
diff changeset
484 $ rm -rf a a-hg a-hg-wc
41616
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
485
41617
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
486 #if execbit
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
487
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
488 Executable bit removal
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
489
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
490 $ hg init a
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
491
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
492 $ echo a > a/exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
493 $ chmod +x a/exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
494 $ hg --cwd a ci -d '1 0' -A -m 'create executable'
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
495 adding exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
496 $ chmod -x a/exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
497 $ hg --cwd a ci -d '2 0' -A -m 'remove executable bit'
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
498
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
499 $ hg convert -d svn a
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
500 assuming destination a-hg
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
501 initializing svn repository 'a-hg'
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
502 initializing svn working copy 'a-hg-wc'
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
503 scanning source...
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
504 sorting...
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
505 converting...
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
506 1 create executable
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
507 0 remove executable bit
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
508 $ svnupanddisplay a-hg-wc 0
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
509 2 2 test .
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
510 2 2 test exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
511 revision: 2
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
512 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
513 date: * (glob)
41617
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
514 msg: remove executable bit
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
515 M /exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
516 revision: 1
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
517 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
518 date: * (glob)
41617
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
519 msg: create executable
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
520 A /exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
521 $ test ! -x a-hg-wc/exec
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
522
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
523 $ rm -rf a a-hg a-hg-wc
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
524
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
525 #endif
36ee0d6d64c5 convert: handle exec bit removal while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41616
diff changeset
526
41616
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
527 Skipping empty commits
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
528
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
529 $ hg init a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
530
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
531 $ hg --cwd a --config ui.allowemptycommit=True ci -d '1 0' -m 'Initial empty commit'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
532
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
533 $ echo a > a/a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
534 $ hg --cwd a ci -d '0 0' -A -m 'Some change'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
535 adding a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
536 $ hg --cwd a --config ui.allowemptycommit=True ci -d '2 0' -m 'Empty commit 1'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
537 $ hg --cwd a --config ui.allowemptycommit=True ci -d '3 0' -m 'Empty commit 2'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
538 $ echo b > a/b
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
539 $ hg --cwd a ci -d '0 0' -A -m 'Another change'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
540 adding b
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
541
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
542 $ hg convert -d svn a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
543 assuming destination a-hg
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
544 initializing svn repository 'a-hg'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
545 initializing svn working copy 'a-hg-wc'
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
546 scanning source...
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
547 sorting...
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
548 converting...
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
549 4 Initial empty commit
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
550 3 Some change
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
551 2 Empty commit 1
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
552 1 Empty commit 2
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
553 0 Another change
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
554
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
555 $ svnupanddisplay a-hg-wc 0
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
556 2 1 test a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
557 2 2 test .
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
558 2 2 test b
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
559 revision: 2
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
560 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
561 date: * (glob)
41616
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
562 msg: Another change
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
563 A /b
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
564 revision: 1
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
565 author: test
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
566 date: * (glob)
41616
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
567 msg: Some change
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
568 A /a
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
569
2c13e91ede6e convert: handle empty intial commits while converting to svn
Nikita Slyusarev <nslus@yandex-team.com>
parents: 39707
diff changeset
570 $ rm -rf a a-hg a-hg-wc
46400
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
571
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
572 Commit dates convertion
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
573
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
574 $ hg init a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
575
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
576 $ echo a >> a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
577 $ hg add a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
578 adding a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
579 $ hg --cwd a ci -d '1 0' -A -m 'Change 1'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
580
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
581 $ echo a >> a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
582 $ hg --cwd a ci -d '2 0' -m 'Change 2'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
583
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
584 $ echo a >> a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
585 $ hg --cwd a ci -d '2 0' -m 'Change at the same time'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
586
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
587 $ echo a >> a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
588 $ hg --cwd a ci -d '1 0' -m 'Change in the past'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
589
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
590 $ echo a >> a/a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
591 $ hg --cwd a ci -d '3 0' -m 'Change in the future'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
592
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
593 $ hg convert --config convert.svn.dangerous-set-commit-dates=true -d svn a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
594 assuming destination a-hg
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
595 initializing svn repository 'a-hg'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
596 initializing svn working copy 'a-hg-wc'
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
597 scanning source...
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
598 sorting...
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
599 converting...
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
600 4 Change 1
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
601 3 Change 2
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
602 2 Change at the same time
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
603 1 Change in the past
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
604 0 Change in the future
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
605 $ svnupanddisplay a-hg-wc 0
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
606 5 5 test .
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
607 5 5 test a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
608 revision: 5
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
609 author: test
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
610 date: 1970-01-01T00:00:03.000000Z
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
611 msg: Change in the future
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
612 M /a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
613 revision: 4
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
614 author: test
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
615 date: 1970-01-01T00:00:01.000000Z
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
616 msg: Change in the past
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
617 M /a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
618 revision: 3
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
619 author: test
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
620 date: 1970-01-01T00:00:02.000000Z
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
621 msg: Change at the same time
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
622 M /a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
623 revision: 2
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
624 author: test
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
625 date: 1970-01-01T00:00:02.000000Z
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
626 msg: Change 2
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
627 M /a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
628 revision: 1
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
629 author: test
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
630 date: 1970-01-01T00:00:01.000000Z
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
631 msg: Change 1
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
632 A /a
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
633
7525e77b5eac convert: option to set date and time for svn commits
Nikita Slyusarev <nslus@yandex-team.com>
parents: 41617
diff changeset
634 $ rm -rf a a-hg a-hg-wc