Mercurial > hg
annotate tests/test-convert-svn-sink.t @ 18510:f254ab6207ae stable
subrepo: use sharepath if available when locating the source repo
This is an alternative fix for issue3518, enabling sharing of repositories with
subrepos, without unconditionally setting the default path in the resulting
repo's hgrc file. Better test coverage is added here, but won't prove this code
is working until fd903f89e42b is backed out.
The problem with the original fix is, if a default path is not available to be
copied over from the share source, the default path on the resulting repo is set
to the source location. Since that's where the actual repository is stored, the
path is essentially self-referential, so push, pull, incoming and outgoing
effectively operate on itself. While incoming and outgoing make it look like
nothing was changed, push currently hangs (see issue3657). In this case where
there is not a real default path, these operations should abort with
"default(-push) not found", like the source repo would. Note this problem with
the original fix affected repos without subrepos too.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 27 Nov 2012 20:56:27 -0500 |
parents | 2da47de36b6f |
children | aa9385f983fa |
rev | line source |
---|---|
17014
50fbe9063ff2
tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16909
diff
changeset
|
1 $ "$TESTDIR/hghave" svn13 || exit 80 |
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 |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
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 > graphlog = |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
21 > EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
22 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
23 $ hg init a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
24 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
25 Add |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
26 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
27 $ echo a > a/a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
28 $ mkdir -p a/d1/d2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
29 $ echo b > a/d1/d2/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
30 $ 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
|
31 adding a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
32 adding d1/d2/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
33 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
34 Modify |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
35 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
36 $ "$TESTDIR/svn-safe-append.py" a a/a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
37 $ 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
|
38 $ 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
|
39 1:e0e2b8a9156b |
5808
80e40ef3d8b8
test-convert-svn-sink: wrap repetitive svn checks in a function
Patrick Mezard <pmezard@gmail.com>
parents:
5698
diff
changeset
|
40 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
41 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
42 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
43 initializing svn repository 'a-hg' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
44 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
45 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
46 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
47 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
48 1 add a file |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
49 0 modify a file |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
50 $ svnupanddisplay a-hg-wc 2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
51 2 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
52 2 1 test d1/d2 (glob) |
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
53 2 1 test d1/d2/b (glob) |
16512
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 . |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
55 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
|
56 revision: 2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
57 author: test |
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 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
62 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
|
63 A /a |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
64 A /d1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
65 A /d1/d2 |
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/b |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
67 $ ls a a-hg-wc |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
68 a: |
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 d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
71 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
72 a-hg-wc: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
73 a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
74 d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
75 $ 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
|
76 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
77 Rename |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
78 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
79 $ hg --cwd a mv a b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
80 $ 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
|
81 $ 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
|
82 2:eb5169441d43 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
83 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
84 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
85 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
86 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
87 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
88 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
89 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
90 0 rename a file |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
91 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
92 3 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
93 3 1 test d1/d2 (glob) |
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
94 3 1 test d1/d2/b (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
95 3 3 test . |
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 b |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
97 revision: 3 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
98 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
99 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
|
100 D /a |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
101 A /b (from /a@2) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
102 $ ls a a-hg-wc |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
103 a: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
104 b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
105 d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
106 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
107 a-hg-wc: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
108 b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
109 d1 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
110 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
111 Copy |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
112 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
113 $ 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
|
114 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
115 $ 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
|
116 $ 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
|
117 3:60effef6ab48 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
118 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
119 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
120 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
121 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
122 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
123 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
124 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
125 0 copy a file |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
126 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
127 4 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
128 4 1 test d1/d2 (glob) |
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
129 4 1 test d1/d2/b (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
130 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
|
131 4 4 test . |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
132 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
|
133 revision: 4 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
134 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
135 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
|
136 A /c (from /b@3) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
137 $ ls a a-hg-wc |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
138 a: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
139 b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
140 c |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
141 d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
142 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
143 a-hg-wc: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
144 b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
145 c |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
146 d1 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
147 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
148 $ 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
|
149 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13530
diff
changeset
|
150 Remove |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13530
diff
changeset
|
151 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
152 $ 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
|
153 $ 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
|
154 4:87bbe3013fb6 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
155 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
156 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
157 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
158 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
159 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
160 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
161 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
162 0 remove a file |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
163 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
164 5 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
165 5 1 test d1/d2 (glob) |
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
166 5 1 test d1/d2/b (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
167 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
|
168 5 5 test . |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
169 revision: 5 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
170 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
171 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
|
172 D /b |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
173 $ ls a a-hg-wc |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
174 a: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
175 c |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
176 d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
177 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
178 a-hg-wc: |
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 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
181 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
182 Executable |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
183 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
184 #if execbit |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
185 $ chmod +x a/c |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
186 #else |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
187 $ echo fake >> a/c |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
188 #endif |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
189 $ 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
|
190 #if execbit |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
191 $ 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
|
192 5:ff42e473c340 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
193 #else |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
194 $ 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
|
195 5:817a700c8cf1 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
196 #endif |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
197 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
198 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
199 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
200 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
201 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
202 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
203 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
204 0 make a file executable |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
205 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
206 6 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
207 6 1 test d1/d2 (glob) |
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
208 6 1 test d1/d2/b (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
209 6 6 test . |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
210 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
|
211 revision: 6 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
212 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
213 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
|
214 M /c |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
215 #if execbit |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
216 $ test -x a-hg-wc/c |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
217 #endif |
16909
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
218 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
219 #if symlink |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
220 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
221 Symlinks |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
222 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
223 $ 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
|
224 $ 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
|
225 adding link |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
226 $ 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
|
227 $ hg --cwd a commit -m 'move symlink' |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
228 $ hg convert -d svn a |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
229 assuming destination a-hg |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
230 initializing svn working copy 'a-hg-wc' |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
231 scanning source... |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
232 sorting... |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
233 converting... |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
234 1 add symlink |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
235 0 move symlink |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
236 $ svnupanddisplay a-hg-wc 1 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
237 8 1 test d1 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
238 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
|
239 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
|
240 8 6 test c |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
241 8 8 test . |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
242 8 8 test newlink |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
243 revision: 8 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
244 author: test |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
245 msg: move symlink |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
246 D /link |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
247 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
|
248 |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
249 #endif |
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
250 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
251 $ 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
|
252 |
16909
b6fd2f8909ff
tests: remove 'hghave symlink' from test-convert-svn-sink.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
253 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
254 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
|
255 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
256 $ 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
|
257 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
258 $ mkdir a/d1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
259 $ echo a > a/d1/a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
260 #if execbit |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
261 $ chmod +x a/d1/a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
262 #else |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
263 $ echo fake >> a/d1/a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
264 #endif |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
265 $ 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
|
266 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
|
267 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
268 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
269 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
270 initializing svn repository 'a-hg' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
271 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
272 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
273 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
274 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
275 0 add executable file in new directory |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
276 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
277 1 1 test . |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
278 1 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
279 1 1 test d1/a (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
280 revision: 1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
281 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
282 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
|
283 A /d1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
284 A /d1/a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16512
diff
changeset
|
285 #if execbit |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
286 $ 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
|
287 #endif |
5698
b63ef7b1441c
convert: svn-sink: copy and set properties after adding dirs/files
Maxim Dounin <mdounin@mdounin.ru>
parents:
5538
diff
changeset
|
288 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
289 Copy to new directory |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
290 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
291 $ mkdir a/d2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
292 $ 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
|
293 $ 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
|
294 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
295 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
296 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
297 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
298 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
299 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
300 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
301 0 copy file to new directory |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
302 $ svnupanddisplay a-hg-wc 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
303 2 1 test d1 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
304 2 1 test d1/a (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
305 2 2 test . |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
306 2 2 test d2 |
17044
3dd6da761fff
tests: add missing path globbing for Windows in svn tests
Mads Kiilerich <mads@kiilerich.com>
parents:
17033
diff
changeset
|
307 2 2 test d2/a (glob) |
16512
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
308 revision: 2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
309 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
310 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
|
311 A /d2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
312 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
|
313 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
314 Branchy history |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
315 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
316 $ hg init b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
317 $ echo base > b/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
318 $ 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
|
319 adding b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
320 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
321 $ "$TESTDIR/svn-safe-append.py" left-1 b/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
322 $ echo left-1 > b/left-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
323 $ 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
|
324 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
|
325 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
326 $ "$TESTDIR/svn-safe-append.py" left-2 b/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
327 $ echo left-2 > b/left-2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
328 $ 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
|
329 adding left-2 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
330 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
331 $ hg --cwd b up 0 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
332 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
|
333 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
334 $ "$TESTDIR/svn-safe-append.py" right-1 b/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
335 $ echo right-1 > b/right-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
336 $ 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
|
337 adding right-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
338 created new head |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
339 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
340 $ "$TESTDIR/svn-safe-append.py" right-2 b/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
341 $ echo right-2 > b/right-2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
342 $ 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
|
343 adding right-2 |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
344 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
345 $ hg --cwd b up -C 2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
346 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
|
347 $ hg --cwd b merge |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
348 merging b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
349 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15442
diff
changeset
|
350 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
351 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
352 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
353 [1] |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
354 $ 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
|
355 $ hg --cwd b resolve -m b |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
356 $ 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
|
357 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
358 Expect 4 changes |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
359 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
360 $ hg convert -d svn b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
361 assuming destination b-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
362 initializing svn repository 'b-hg' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
363 initializing svn working copy 'b-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
364 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
365 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
366 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
367 5 base |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
368 4 left-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
369 3 left-2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
370 2 right-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
371 1 right-2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
372 0 merge |
5513
f0c58fd4b798
convert: add support for Subversion as a sink
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
373 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
374 $ 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
|
375 4 2 test left-1 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
376 4 3 test b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
377 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
|
378 4 4 test . |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
379 4 4 test right-1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
380 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
|
381 revision: 4 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
382 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
383 msg: merge |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
384 A /right-1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
385 A /right-2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
386 revision: 3 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
387 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
388 msg: left-2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
389 M /b |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
390 A /left-2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
391 revision: 2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
392 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
393 msg: left-1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
394 M /b |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
395 A /left-1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
396 revision: 1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
397 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
398 msg: base |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
399 A /b |
11835
14db59e3b248
convert: Test svn sink for a repo with tags.
Daniel J. Lauk <daniel.lauk@gmail.com>
parents:
8049
diff
changeset
|
400 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
401 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
|
402 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
403 $ 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
|
404 $ hg init a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
405 $ echo a > a/a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
406 $ 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
|
407 adding a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
408 $ 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
|
409 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
410 $ hg convert -d svn a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
411 assuming destination a-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
412 initializing svn repository 'a-hg' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
413 initializing svn working copy 'a-hg-wc' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
414 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
415 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
416 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
417 1 Add file a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
418 0 Tagged as v1.0 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
419 writing Subversion tags is not yet implemented |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
420 $ 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
|
421 2 1 test a |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
422 2 2 test . |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
423 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
|
424 revision: 2 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
425 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
426 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
|
427 A /.hgtags |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
428 revision: 1 |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
429 author: test |
c58bdecdb800
test-convert-svn-sink: add helper to smooth svn xml output
Patrick Mezard <patrick@mezard.eu>
parents:
15501
diff
changeset
|
430 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
|
431 A /a |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12343
diff
changeset
|
432 $ rm -rf a a-hg a-hg-wc |