Mercurial > hg
annotate tests/test-subrepo-svn.t @ 15800:e4fc0f0b4f7e stable
rebase: reinstate old-style rev spec support for the source and base (issue3181)
As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command
accepted ONLY revsets for the source and base arguments and no longer accepted
old-style revision specifications. As a result, some revision names were no
longer recognised, e.g.
hg rebase --base br-anch
abort: unknown revision 'br'!
These arguments are now interpreted first as old-style revision specifications,
then as revsets when no matching revision is found. This restores backwards
compatibility with releases prior to 2.0.
author | Steven Brown <StevenGBrown@gmail.com> |
---|---|
date | Sun, 08 Jan 2012 23:09:35 +0800 |
parents | fab28a577a38 |
children | b254f827b7a6 c9c8c9053119 |
rev | line source |
---|---|
15346
53f37b24f26a
tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15321
diff
changeset
|
1 $ "$TESTDIR/hghave" svn15 || exit 80 |
10178 | 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
3 $ fix_path() |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
4 > { |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
5 > tr '\\' / |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
6 > } |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
7 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
8 SVN wants all paths to start with a slash. Unfortunately, Windows ones |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
9 don't. Handle that. |
10178 | 10 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
11 $ escapedwd=`pwd | fix_path` |
12404
f33a5d1c937e
test-subrepo-svn: restore expr functionality for solaris
Mads Kiilerich <mads@kiilerich.com>
parents:
12377
diff
changeset
|
12 $ expr "$escapedwd" : '\/' > /dev/null || escapedwd="/$escapedwd" |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
13 $ escapedwd=`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$escapedwd"` |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
14 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
15 create subversion repo |
10178 | 16 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
17 $ SVNREPO="file://$escapedwd/svn-repo" |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
18 $ WCROOT="`pwd`/svn-wc" |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
19 $ svnadmin create svn-repo |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
20 $ svn co "$SVNREPO" svn-wc |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
21 Checked out revision 0. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
22 $ cd svn-wc |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
23 $ mkdir src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
24 $ echo alpha > src/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
25 $ svn add src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
26 A src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
27 A src/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
28 $ mkdir externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
29 $ echo other > externals/other |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
30 $ svn add externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
31 A externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
32 A externals/other |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
33 $ svn ci -m 'Add alpha' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
34 Adding externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
35 Adding externals/other |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
36 Adding src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
37 Adding src/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
38 Transmitting file data .. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
39 Committed revision 1. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
40 $ svn up -q |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
41 $ echo "externals -r1 $SVNREPO/externals" > extdef |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
42 $ svn propset -F extdef svn:externals src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
43 property 'svn:externals' set on 'src' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
44 $ svn ci -m 'Setting externals' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
45 Sending src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
46 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
47 Committed revision 2. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
48 $ cd .. |
10178 | 49 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
50 create hg repo |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
51 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
52 $ mkdir sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
53 $ cd sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
54 $ hg init t |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
55 $ cd t |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
56 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
57 first revision, no sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
58 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
59 $ echo a > a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
60 $ hg ci -Am0 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
61 adding a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
62 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
63 add first svn sub with leading whitespaces |
10178 | 64 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
65 $ echo "s = [svn] $SVNREPO/src" >> .hgsub |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
66 $ echo "subdir/s = [svn] $SVNREPO/src" >> .hgsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
67 $ svn co --quiet "$SVNREPO"/src s |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
68 $ mkdir subdir |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
69 $ svn co --quiet "$SVNREPO"/src subdir/s |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
70 $ hg add .hgsub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
71 $ hg ci -m1 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
72 committing subrepository s |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
73 committing subrepository subdir/s |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
74 |
12798
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
75 make sure we avoid empty commits (issue2445) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
76 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
77 $ hg sum |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
78 parent: 1:* tip (glob) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
79 1 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
80 branch: default |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
81 commit: (clean) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
82 update: (current) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
83 $ hg ci -moops |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
84 nothing changed |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
85 [1] |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
86 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
87 debugsub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
88 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
89 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
90 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
91 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
92 revision 2 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
93 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
94 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
95 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
96 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
97 change file in svn and hg, commit |
10178 | 98 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
99 $ echo a >> a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
100 $ echo alpha >> s/alpha |
12798
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
101 $ hg sum |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
102 parent: 1:* tip (glob) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
103 1 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
104 branch: default |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
105 commit: 1 modified, 1 subrepos |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
106 update: (current) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
107 $ hg commit --subrepos -m 'Message!' | grep -v Updating |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
108 committing subrepository s |
12377
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12376
diff
changeset
|
109 Sending*s/alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
110 Transmitting file data . |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
111 Committed revision 3. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
112 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
113 Fetching external item into '*s/externals'* (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
114 External at revision 1. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
115 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
116 At revision 3. |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
117 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
118 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
119 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
120 revision 3 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
121 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
122 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
123 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
124 |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
125 add an unrelated revision in svn and update the subrepo to without |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
126 bringing any changes. |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
127 |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
128 $ svn mkdir "$SVNREPO/unrelated" -m 'create unrelated' |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
129 |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
130 Committed revision 4. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
131 $ svn up -q s |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
132 $ hg sum |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
133 parent: 2:* tip (glob) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
134 Message! |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
135 branch: default |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
136 commit: (clean) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
137 update: (current) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
138 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
139 $ echo a > s/a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
140 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
141 should be empty despite change to s/a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
142 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
143 $ hg st |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
144 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
145 add a commit from svn |
10178 | 146 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
147 $ cd "$WCROOT"/src |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
148 $ svn up -q |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
149 $ echo xyz >> alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
150 $ svn propset svn:mime-type 'text/xml' alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
151 property 'svn:mime-type' set on 'alpha' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
152 $ svn ci -m 'amend a from svn' |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
153 Sending *alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
154 Transmitting file data . |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
155 Committed revision 5. |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
156 $ cd ../../sub/t |
10178 | 157 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
158 this commit from hg will fail |
10178 | 159 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
160 $ echo zzz >> s/alpha |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
161 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
162 committing subrepository s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
163 abort: svn:*Commit failed (details follow): (glob) |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
164 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
165 $ svn revert -q s/alpha |
10273
e898bc7810ad
subrepo: handle svn externals and meta changes (issue1982)
Patrick Mezard <pmezard@gmail.com>
parents:
10267
diff
changeset
|
166 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
167 this commit fails because of meta changes |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
168 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
169 $ svn propset svn:mime-type 'text/html' s/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
170 property 'svn:mime-type' set on 's/alpha' |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
171 $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
172 committing subrepository s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
173 abort: svn:*Commit failed (details follow): (glob) |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
174 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
175 $ svn revert -q s/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
176 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
177 this commit fails because of externals changes |
10273
e898bc7810ad
subrepo: handle svn externals and meta changes (issue1982)
Patrick Mezard <pmezard@gmail.com>
parents:
10267
diff
changeset
|
178 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
179 $ echo zzz > s/externals/other |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15282
diff
changeset
|
180 $ hg ci --subrepos -m 'amend externals from hg' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
181 committing subrepository s |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
182 abort: cannot commit svn externals |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12209
diff
changeset
|
183 [255] |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
184 $ hg diff --subrepos -r 1:2 | grep -v diff |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
185 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
186 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
187 @@ -1,2 +1,2 @@ |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
188 -2 s |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
189 +3 s |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
190 2 subdir/s |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
191 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
192 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
193 @@ -1,1 +1,2 @@ |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
194 a |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
195 +a |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
196 $ svn revert -q s/externals/other |
10273
e898bc7810ad
subrepo: handle svn externals and meta changes (issue1982)
Patrick Mezard <pmezard@gmail.com>
parents:
10267
diff
changeset
|
197 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
198 this commit fails because of externals meta changes |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
199 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
200 $ svn propset svn:mime-type 'text/html' s/externals/other |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
201 property 'svn:mime-type' set on 's/externals/other' |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15282
diff
changeset
|
202 $ hg ci --subrepos -m 'amend externals from hg' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
203 committing subrepository s |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
204 abort: cannot commit svn externals |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12209
diff
changeset
|
205 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
206 $ svn revert -q s/externals/other |
10273
e898bc7810ad
subrepo: handle svn externals and meta changes (issue1982)
Patrick Mezard <pmezard@gmail.com>
parents:
10267
diff
changeset
|
207 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
208 clone |
10178 | 209 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
210 $ cd .. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
211 $ hg clone t tc | fix_path |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
212 updating to branch default |
13907
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
213 A tc/s/alpha |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
214 U tc/s |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
215 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
216 Fetching external item into 'tc/s/externals'* (glob) |
13907
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
217 A tc/s/externals/other |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
218 Checked out external at revision 1. |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
219 |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
220 Checked out revision 3. |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
221 A tc/subdir/s/alpha |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
222 U tc/subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
223 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
224 Fetching external item into 'tc/subdir/s/externals'* (glob) |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
225 A tc/subdir/s/externals/other |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
226 Checked out external at revision 1. |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
227 |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
228 Checked out revision 2. |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
229 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
230 $ cd tc |
10954
33119d0252c1
subrepo: fix repo root path handling in svn subrepo
Brett Cannon <brett@python.org>
parents:
10791
diff
changeset
|
231 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
232 debugsub in clone |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
233 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
234 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
235 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
236 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
237 revision 3 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
238 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
239 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
240 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
241 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
242 verify subrepo is contained within the repo directory |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
243 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
244 $ python -c "import os.path; print os.path.exists('s')" |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
245 True |
12930
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
246 |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
247 update to nullrev (must delete the subrepo) |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
248 |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
249 $ hg up null |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
250 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
251 $ ls |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
252 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
253 Check hg update --clean |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
254 $ cd $TESTTMP/sub/t |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
255 $ cd s |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
256 $ echo c0 > alpha |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
257 $ echo c1 > f1 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
258 $ echo c1 > f2 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
259 $ svn add f1 -q |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
260 $ svn status | sort |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
261 |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
262 ? * a (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
263 ? * f2 (glob) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
264 A * f1 (glob) |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
265 M * alpha (glob) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
266 Performing status on external item at 'externals'* (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
267 X * externals (glob) |
13332
927e3940bfc3
subrepo: fix update -C with svn subrepos when cwd != repo.root
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
268 $ cd ../.. |
927e3940bfc3
subrepo: fix update -C with svn subrepos when cwd != repo.root
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
269 $ hg -R t update -C |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
270 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
271 Fetching external item into 't/s/externals'* (glob) |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
272 Checked out external at revision 1. |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
273 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
274 Checked out revision 3. |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
275 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13332
927e3940bfc3
subrepo: fix update -C with svn subrepos when cwd != repo.root
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
276 $ cd t/s |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
277 $ svn status |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
278 ? * a (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
279 X * externals (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
280 ? * f1 (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
281 ? * f2 (glob) |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
282 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
283 Performing status on external item at 'externals'* (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
284 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
285 Sticky subrepositories, no changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
286 $ cd $TESTTMP/sub/t |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
287 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
288 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
289 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
290 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
291 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
292 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
293 $ hg update 1 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
294 U *s/alpha (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
295 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
296 Fetching external item into '*s/externals'* (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
297 Checked out external at revision 1. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
298 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
299 Checked out revision 2. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
300 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
301 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
302 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
303 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
304 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
305 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
306 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
307 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
308 Sticky subrepositorys, file changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
309 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
310 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
311 $ svn add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
312 A f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
313 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
314 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
315 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
316 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
317 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
318 2M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
319 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
320 $ hg update tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
321 subrepository sources for s differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
322 use (l)ocal source (2) or (r)emote source (3)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
323 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
325 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
326 2+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
327 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
328 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
329 2M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
330 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
331 $ hg update --clean tip |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
332 U *s/alpha (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
333 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
334 Fetching external item into '*s/externals'* (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
335 Checked out external at revision 1. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
336 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
337 Checked out revision 3. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
338 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
339 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
340 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
341 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
342 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
343 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
344 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
345 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
346 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
347 $ cd s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
348 $ svn update -qr 1 |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
349 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
350 $ hg update 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
351 subrepository sources for s differ (in checked out version) |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
352 use (l)ocal source (1) or (r)emote source (2)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
353 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
354 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
355 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
356 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
357 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
358 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
359 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
360 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
361 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
362 Sticky subrepository, file changes and revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
363 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
364 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
365 $ svn add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
366 A f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
367 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
368 1M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
369 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
370 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
371 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
372 $ hg update tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
373 subrepository sources for s differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
374 use (l)ocal source (1) or (r)emote source (3)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
375 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
376 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
377 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
378 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
379 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
380 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
381 1M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
382 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
383 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
384 Sticky repository, update --clean |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
385 $ hg update --clean tip | grep -v s/externals/other |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
386 U *s/alpha (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
387 U *s (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
388 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
389 Fetching external item into '*s/externals'* (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
390 Checked out external at revision 1. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
391 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
392 Checked out revision 3. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
393 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
394 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
395 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
396 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
397 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
398 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
399 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
400 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
401 Test subrepo already at intended revision: |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
402 $ cd s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
403 $ svn update -qr 2 |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
404 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
405 $ hg update 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
407 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
408 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
409 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
410 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
411 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
412 $ cd .. |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
413 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
414 Test case where subversion would fail to update the subrepo because there |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
415 are unknown directories being replaced by tracked ones (happens with rebase). |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
416 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
417 $ cd $WCROOT/src |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
418 $ mkdir dir |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
419 $ echo epsilon.py > dir/epsilon.py |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
420 $ svn add dir |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
421 A dir |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
422 A dir/epsilon.py |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
423 $ svn ci -m 'Add dir/epsilon.py' |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
424 Adding *dir (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
425 Adding *dir/epsilon.py (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
426 Transmitting file data . |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
427 Committed revision 6. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
428 $ cd ../.. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
429 $ hg init rebaserepo |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
430 $ cd rebaserepo |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
431 $ svn co -r5 --quiet "$SVNREPO"/src s |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
432 $ echo "s = [svn] $SVNREPO/src" >> .hgsub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
433 $ hg add .hgsub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
434 $ hg ci -m addsub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
435 committing subrepository s |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
436 $ echo a > a |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
437 $ hg ci -Am adda |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
438 adding a |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
439 $ hg up 0 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
440 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
441 $ svn up -qr6 s |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
442 $ hg ci -m updatesub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
443 committing subrepository s |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
444 created new head |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
445 $ echo pyc > s/dir/epsilon.pyc |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
446 $ hg up 1 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
447 D *s/dir (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
448 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
449 Fetching external item into '*s/externals'* (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
450 Checked out external at revision 1. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
451 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
452 Checked out revision 5. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
453 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
454 $ if "$TESTDIR/hghave" -q svn15; then |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
455 > hg up 2 >/dev/null 2>&1 || echo update failed |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
456 > fi |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
457 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
458 Modify one of the externals to point to a different path so we can |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
459 test having obstructions when switching branches on checkout: |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
460 $ hg checkout tip |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
461 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
462 $ echo "obstruct = [svn] $SVNREPO/externals" >> .hgsub |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
463 $ svn co -r5 --quiet "$SVNREPO"/externals obstruct |
15372
695ac6aca77f
check-code: fix issues with finding patterns in unified tests, fix tests
Matt Mackall <mpm@selenic.com>
parents:
15346
diff
changeset
|
464 $ hg commit -m 'Start making obstructed working copy' |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
465 committing subrepository obstruct |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
466 $ hg book other |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
467 $ hg co -r 'p1(tip)' |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
468 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
469 $ echo "obstruct = [svn] $SVNREPO/src" >> .hgsub |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
470 $ svn co -r5 --quiet "$SVNREPO"/src obstruct |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
471 $ hg commit -m 'Other branch which will be obstructed' |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
472 committing subrepository obstruct |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
473 created new head |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
474 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
475 Switching back to the head where we have another path mapped to the |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
476 same subrepo should work if the subrepo is clean. |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
477 $ hg co other |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
478 A *obstruct/other (glob) |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
479 Checked out revision 1. |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
480 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
481 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
482 This is surprising, but is also correct based on the current code: |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
483 $ echo "updating should (maybe) fail" > obstruct/other |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
484 $ hg co tip |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
485 abort: crosses branches (merge branches or use --clean to discard changes) |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
486 [255] |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
487 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
488 Point to a Subversion branch which has since been deleted and recreated |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
489 First, create that condition in the repository. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
490 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
491 $ hg ci --subrepos -m cleanup | grep -v Updating |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
492 committing subrepository obstruct |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
493 Sending obstruct/other |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
494 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
495 Committed revision 7. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
496 At revision 7. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
497 $ svn mkdir -m "baseline" $SVNREPO/trunk |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
498 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
499 Committed revision 8. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
500 $ svn copy -m "initial branch" $SVNREPO/trunk $SVNREPO/branch |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
501 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
502 Committed revision 9. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
503 $ svn co --quiet "$SVNREPO"/branch tempwc |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
504 $ cd tempwc |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
505 $ echo "something old" > somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
506 $ svn add somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
507 A somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
508 $ svn ci -m 'Something old' |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
509 Adding somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
510 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
511 Committed revision 10. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
512 $ svn rm -m "remove branch" $SVNREPO/branch |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
513 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
514 Committed revision 11. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
515 $ svn copy -m "recreate branch" $SVNREPO/trunk $SVNREPO/branch |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
516 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
517 Committed revision 12. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
518 $ svn up -q |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
519 $ echo "something new" > somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
520 $ svn add somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
521 A somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
522 $ svn ci -m 'Something new' |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
523 Adding somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
524 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
525 Committed revision 13. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
526 $ cd .. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
527 $ rm -rf tempwc |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
528 $ svn co "$SVNREPO/branch"@10 recreated |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
529 A recreated/somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
530 Checked out revision 10. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
531 $ echo "recreated = [svn] $SVNREPO/branch" >> .hgsub |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
532 $ hg ci -m addsub |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
533 committing subrepository recreated |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
534 $ cd recreated |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
535 $ svn up -q |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
536 $ cd .. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
537 $ hg ci -m updatesub |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
538 committing subrepository recreated |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
539 $ hg up -r-2 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
540 D *recreated/somethingnew (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
541 A *recreated/somethingold (glob) |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
542 Checked out revision 10. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
543 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15282
d4addef0ec74
tests: don't use 'test -e'
Mads Kiilerich <mads@kiilerich.com>
parents:
14820
diff
changeset
|
544 $ test -f recreated/somethingold |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
545 |