Mercurial > hg
annotate tests/test-subrepo-svn.t @ 23062:ba89f7b542c9 stable
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
The recent optimization of "and" operation relies on the assumption that
the rhs set does not contain invalid revisions. So rev() has to remove
invalid revisions.
This is still faster than using `.filter(lambda r: r == l)`.
revset #0: rev(25)
0) wall 0.026341 comb 0.020000 user 0.020000 sys 0.000000 (best of 113)
1) wall 0.000038 comb 0.000000 user 0.000000 sys 0.000000 (best of 66567)
2) wall 0.000062 comb 0.000000 user 0.000000 sys 0.000000 (best of 43699)
(0: bbf4f3dfd700^, 1: 3.2-rc, 2: this patch)
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 19 Oct 2014 16:48:33 +0900 |
parents | c63a09b6b337 |
children | 8f02682ff3b0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
21930
diff
changeset
|
1 #require svn15 |
10178 | 2 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
3 $ SVNREPOPATH=`pwd`/svn-repo |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
4 #if windows |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22590
diff
changeset
|
5 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
6 #else |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22590
diff
changeset
|
7 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
8 #endif |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
9 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
10 create subversion repo |
10178 | 11 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
12 $ WCROOT="`pwd`/svn-wc" |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
13 $ svnadmin create svn-repo |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
14 $ svn co "$SVNREPOURL" svn-wc |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
15 Checked out revision 0. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
16 $ cd svn-wc |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
17 $ mkdir src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
18 $ echo alpha > src/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
19 $ svn add src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
20 A src |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
21 A src/alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
22 $ mkdir externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
23 $ echo other > externals/other |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
24 $ svn add externals |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
25 A externals |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
26 A externals/other (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
27 $ svn ci -m 'Add alpha' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
28 Adding externals |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
29 Adding externals/other (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
30 Adding src |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
31 Adding src/alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
32 Transmitting file data .. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
33 Committed revision 1. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
34 $ svn up -q |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
35 $ echo "externals -r1 $SVNREPOURL/externals" > extdef |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
36 $ svn propset -F extdef svn:externals src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
37 property 'svn:externals' set on 'src' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
38 $ svn ci -m 'Setting externals' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
39 Sending src |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
40 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
41 Committed revision 2. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
42 $ cd .. |
10178 | 43 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
44 create hg repo |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
45 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
46 $ mkdir sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
47 $ cd sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
48 $ hg init t |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
49 $ cd t |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
50 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
51 first revision, no sub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
52 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
53 $ echo a > a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
54 $ hg ci -Am0 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
55 adding a |
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 add first svn sub with leading whitespaces |
10178 | 58 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
59 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
60 $ echo "subdir/s = [svn] $SVNREPOURL/src" >> .hgsub |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
61 $ svn co --quiet "$SVNREPOURL"/src s |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
62 $ mkdir subdir |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
63 $ svn co --quiet "$SVNREPOURL"/src subdir/s |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
64 $ hg add .hgsub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
65 $ hg ci -m1 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
66 |
12798
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
67 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
|
68 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
69 $ hg sum |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
70 parent: 1:* tip (glob) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
71 1 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
72 branch: default |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
73 commit: (clean) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
74 update: (current) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
75 $ hg ci -moops |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
76 nothing changed |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
77 [1] |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
78 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
79 debugsub |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
80 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
81 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
82 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
83 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
84 revision 2 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
85 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
86 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
87 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
88 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
89 change file in svn and hg, commit |
10178 | 90 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
91 $ echo a >> a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
92 $ echo alpha >> s/alpha |
12798
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
93 $ hg sum |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
94 parent: 1:* tip (glob) |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
95 1 |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
96 branch: default |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
97 commit: 1 modified, 1 subrepos |
3d6ba8c2b1b8
subrepo: fix status check on SVN subrepos (issue2445)
Matt Mackall <mpm@selenic.com>
parents:
12668
diff
changeset
|
98 update: (current) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
99 $ hg commit --subrepos -m 'Message!' | grep -v Updating |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
100 committing subrepository s |
12377
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12376
diff
changeset
|
101 Sending*s/alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
102 Transmitting file data . |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
103 Committed revision 3. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
104 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
105 Fetching external item into '*s/externals'* (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
106 External at revision 1. |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
107 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
108 At revision 3. |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
109 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
110 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
111 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
112 revision 3 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
113 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
114 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
115 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
116 |
16529
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
117 missing svn file, commit should fail |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
118 |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
119 $ rm s/alpha |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
120 $ hg commit --subrepos -m 'abort on missing file' |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
121 committing subrepository s |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17255
diff
changeset
|
122 abort: cannot commit missing svn entries (in subrepo s) |
16529
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
123 [255] |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
124 $ svn revert s/alpha > /dev/null |
3d5d204a08c7
subrepo/svn: abort on commit with missing file (issue3029)
Patrick Mezard <patrick@mezard.eu>
parents:
16527
diff
changeset
|
125 |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
126 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
|
127 bringing any changes. |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
128 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
129 $ svn mkdir "$SVNREPOURL/unrelated" -m 'create unrelated' |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
130 |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
131 Committed revision 4. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
132 $ svn up -q s |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
133 $ hg sum |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
134 parent: 2:* tip (glob) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
135 Message! |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
136 branch: default |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
137 commit: (clean) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
138 update: (current) |
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
139 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
140 $ echo a > s/a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
141 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
142 should be empty despite change to s/a |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
143 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
144 $ hg st |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
145 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
146 add a commit from svn |
10178 | 147 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
148 $ cd "$WCROOT/src" |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
149 $ svn up -q |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
150 $ echo xyz >> alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
151 $ svn propset svn:mime-type 'text/xml' alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
152 property 'svn:mime-type' set on 'alpha' |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
153 $ 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
|
154 Sending *alpha (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
155 Transmitting file data . |
13287
d0e0d3d43e14
subrepo: compare svn subrepo state to last committed revision
Patrick Mezard <pmezard@gmail.com>
parents:
13015
diff
changeset
|
156 Committed revision 5. |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
157 $ cd ../../sub/t |
10178 | 158 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
159 this commit from hg will fail |
10178 | 160 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
161 $ 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
|
162 $ (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
|
163 committing subrepository s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
164 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
|
165 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
166 $ svn revert -q s/alpha |
10273
e898bc7810ad
subrepo: handle svn externals and meta changes (issue1982)
Patrick Mezard <pmezard@gmail.com>
parents:
10267
diff
changeset
|
167 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
168 this commit fails because of meta changes |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
169 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
170 $ svn propset svn:mime-type 'text/html' s/alpha |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
171 property 'svn:mime-type' set on 's/alpha' (glob) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
172 $ (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
|
173 committing subrepository s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
174 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
|
175 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
176 $ svn revert -q s/alpha |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
177 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
178 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
|
179 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
180 $ 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
|
181 $ hg ci --subrepos -m 'amend externals from hg' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
182 committing subrepository s |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17255
diff
changeset
|
183 abort: cannot commit svn externals (in subrepo s) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12209
diff
changeset
|
184 [255] |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
185 $ 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
|
186 --- 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
|
187 +++ 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
|
188 @@ -1,2 +1,2 @@ |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
189 -2 s |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
190 +3 s |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
191 2 subdir/s |
12209
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
192 --- 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
|
193 +++ 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
|
194 @@ -1,1 +1,2 @@ |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
195 a |
affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Patrick Mezard <pmezard@gmail.com>
parents:
11916
diff
changeset
|
196 +a |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
197 $ 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
|
198 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
199 this commit fails because of externals meta changes |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
200 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
201 $ svn propset svn:mime-type 'text/html' s/externals/other |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
202 property 'svn:mime-type' set on 's/externals/other' (glob) |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15282
diff
changeset
|
203 $ hg ci --subrepos -m 'amend externals from hg' |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
204 committing subrepository s |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17255
diff
changeset
|
205 abort: cannot commit svn externals (in subrepo s) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12209
diff
changeset
|
206 [255] |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
207 $ 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
|
208 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
209 clone |
10178 | 210 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
211 $ cd .. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
212 $ hg clone t tc |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
213 updating to branch default |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
214 A tc/s/alpha (glob) |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
215 U tc/s (glob) |
13907
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
216 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
217 Fetching external item into 'tc/s/externals'* (glob) |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
218 A tc/s/externals/other (glob) |
13907
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
219 Checked out external at revision 1. |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
220 |
a0ed0d0dd713
subrepo: fix up svn test output
Matt Mackall <mpm@selenic.com>
parents:
13559
diff
changeset
|
221 Checked out revision 3. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
222 A tc/subdir/s/alpha (glob) |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
223 U tc/subdir/s (glob) |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
224 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
225 Fetching external item into 'tc/subdir/s/externals'* (glob) |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
226 A tc/subdir/s/externals/other (glob) |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
227 Checked out external at revision 1. |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
228 |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
229 Checked out revision 2. |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
230 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
|
231 $ cd tc |
10954
33119d0252c1
subrepo: fix repo root path handling in svn subrepo
Brett Cannon <brett@python.org>
parents:
10791
diff
changeset
|
232 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
233 debugsub in clone |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
234 |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
235 $ hg debugsub |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
236 path s |
12668
89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
237 source file://*/svn-repo/src (glob) |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
238 revision 3 |
13015
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
239 path subdir/s |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
240 source file://*/svn-repo/src (glob) |
82ca0c43bc44
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com>
parents:
12930
diff
changeset
|
241 revision 2 |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
242 |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
243 verify subrepo is contained within the repo directory |
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
244 |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22590
diff
changeset
|
245 $ $PYTHON -c "import os.path; print os.path.exists('s')" |
11916
d1ea16ca6520
tests: unify test-subrepo-svn
Martin Geisler <mg@lazybytes.net>
parents:
11142
diff
changeset
|
246 True |
12930
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
247 |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
248 update to nullrev (must delete the subrepo) |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
249 |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
250 $ hg up null |
9bb180abc4d0
subrepo: test & fix svn subrepo removal
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
12798
diff
changeset
|
251 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
|
252 $ ls |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
253 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
254 Check hg update --clean |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
255 $ cd "$TESTTMP/sub/t" |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
256 $ cd s |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
257 $ echo c0 > alpha |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
258 $ echo c1 > f1 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
259 $ echo c1 > f2 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
260 $ 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
|
261 $ svn status | sort |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
262 |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
263 ? * a (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
264 ? * f2 (glob) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
265 A * f1 (glob) |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
266 M * alpha (glob) |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
267 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
|
268 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
|
269 $ cd ../.. |
927e3940bfc3
subrepo: fix update -C with svn subrepos when cwd != repo.root
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
270 $ 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
|
271 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
272 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
|
273 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
|
274 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13287
diff
changeset
|
275 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
|
276 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
|
277 $ cd t/s |
16526
f2cc0ffb09de
test-subrepo-svn: fix non-determinism
Patrick Mezard <patrick@mezard.eu>
parents:
16451
diff
changeset
|
278 $ svn status | sort |
f2cc0ffb09de
test-subrepo-svn: fix non-determinism
Patrick Mezard <patrick@mezard.eu>
parents:
16451
diff
changeset
|
279 |
13410
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
280 ? * a (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
281 ? * f1 (glob) |
1f2b2c33d386
tests: fixes for svn 1.4.2
Matt Mackall <mpm@selenic.com>
parents:
13332
diff
changeset
|
282 ? * f2 (glob) |
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) |
16526
f2cc0ffb09de
test-subrepo-svn: fix non-determinism
Patrick Mezard <patrick@mezard.eu>
parents:
16451
diff
changeset
|
284 X * externals (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
285 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
286 Sticky subrepositories, no changes |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
287 $ cd "$TESTTMP/sub/t" |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
288 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
289 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
290 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
291 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
292 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
293 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
294 $ hg update 1 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
295 U *s/alpha (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
296 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
297 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
|
298 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
|
299 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
300 Checked out revision 2. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
301 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
|
302 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
303 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
304 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
305 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
306 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
307 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
308 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
19811
diff
changeset
|
309 Sticky subrepositories, file changes |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
310 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
311 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
312 $ svn add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
313 A f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
314 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
315 $ hg id -n |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
17108
diff
changeset
|
316 1+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
317 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
318 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
319 2M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
320 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
321 $ hg update tip |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
322 subrepository s diverged (local revision: 2, remote revision: 3) |
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
323 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
324 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
325 use (l)ocal source (2) or (r)emote source (3)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
326 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
|
327 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
328 2+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
329 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
330 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
331 2M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
332 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
333 $ 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
|
334 U *s/alpha (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
335 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
336 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
|
337 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
|
338 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
339 Checked out revision 3. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
340 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
|
341 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
342 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
343 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
344 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
345 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
346 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
347 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
348 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
349 $ cd s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
350 $ svn update -qr 1 |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
351 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
352 $ hg update 1 |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
353 subrepository s diverged (local revision: 3, remote revision: 2) |
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
354 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
355 subrepository sources for s differ (in checked out version) |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
356 use (l)ocal source (1) or (r)emote source (2)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
357 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
|
358 $ hg id -n |
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 s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
361 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
362 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
363 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
364 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
365 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
|
366 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
367 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
368 $ svn add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
369 A f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
370 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
371 1M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
372 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
373 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
374 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
375 $ hg update tip |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
376 subrepository s diverged (local revision: 3, remote revision: 3) |
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
377 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
378 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
379 use (l)ocal source (1) or (r)emote source (3)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
380 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
|
381 $ hg id -n |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
17108
diff
changeset
|
382 2+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
383 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
384 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
385 1M |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
386 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
387 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
388 Sticky repository, update --clean |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
389 $ hg update --clean tip | grep -v 's[/\]externals[/\]other' |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
390 U *s/alpha (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
391 U *s (glob) |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
392 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
393 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
|
394 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
|
395 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
396 Checked out revision 3. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
397 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
|
398 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
399 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
400 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
401 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
402 3 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
403 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
404 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
405 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
|
406 $ cd s |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
407 $ svn update -qr 2 |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
408 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
409 $ hg update 1 |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
410 subrepository s diverged (local revision: 3, remote revision: 2) |
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19799
diff
changeset
|
411 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
412 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
|
413 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
414 1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
415 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
416 $ svnversion |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
417 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13410
diff
changeset
|
418 $ cd .. |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
419 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
420 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
|
421 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
|
422 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
423 $ cd "$WCROOT/src" |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
424 $ mkdir dir |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
425 $ echo epsilon.py > dir/epsilon.py |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
426 $ svn add dir |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
427 A dir |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
428 A dir/epsilon.py (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
429 $ 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
|
430 Adding *dir (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
431 Adding *dir/epsilon.py (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
432 Transmitting file data . |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
433 Committed revision 6. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
434 $ cd ../.. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
435 $ hg init rebaserepo |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
436 $ cd rebaserepo |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
437 $ svn co -r5 --quiet "$SVNREPOURL"/src s |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
438 $ echo "s = [svn] $SVNREPOURL/src" >> .hgsub |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
439 $ hg add .hgsub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
440 $ hg ci -m addsub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
441 $ echo a > a |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
442 $ hg ci -Am adda |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
443 adding a |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
444 $ hg up 0 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
445 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
|
446 $ svn up -qr6 s |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
447 $ hg ci -m updatesub |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
448 created new head |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
449 $ echo pyc > s/dir/epsilon.pyc |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
450 $ hg up 1 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
451 D *s/dir (glob) |
14050
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
452 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
453 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
|
454 Checked out external at revision 1. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
455 |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
456 Checked out revision 5. |
9e8a9d45945c
subrepo: handle svn tracked/unknown directory collisions
Patrick Mezard <pmezard@gmail.com>
parents:
13559
diff
changeset
|
457 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16898
bb91c602d4ad
tests: change odd uses of 'if hghave' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16554
diff
changeset
|
458 $ hg up -q 2 |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
459 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
460 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
|
461 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
|
462 $ hg checkout tip |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
463 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
464 $ echo "obstruct = [svn] $SVNREPOURL/externals" >> .hgsub |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
465 $ svn co -r5 --quiet "$SVNREPOURL"/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
|
466 $ 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
|
467 $ hg book other |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
468 $ hg co -r 'p1(tip)' |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
469 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21404
ca275f7ec576
update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com>
parents:
21024
diff
changeset
|
470 (leaving bookmark other) |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
471 $ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub |
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
472 $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
473 $ 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
|
474 created new head |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
475 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
476 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
|
477 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
|
478 $ hg co other |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
479 A *obstruct/other (glob) |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
480 Checked out revision 1. |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
481 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21503
10f15e34d86c
update: show message when a bookmark is activated by update
Stephen Lee <sphen.lee@gmail.com>
parents:
21404
diff
changeset
|
482 (activating bookmark other) |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
483 |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
484 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
|
485 $ echo "updating should (maybe) fail" > obstruct/other |
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
486 $ hg co tip |
19799
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
18364
diff
changeset
|
487 abort: uncommitted changes |
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
18364
diff
changeset
|
488 (commit or update --clean to discard changes) |
14664
0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
Augie Fackler <durin42@gmail.com>
parents:
14052
diff
changeset
|
489 [255] |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
490 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
491 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
|
492 First, create that condition in the repository. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
493 |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
494 $ 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
|
495 committing subrepository obstruct |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
496 Sending obstruct/other (glob) |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
497 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
498 Committed revision 7. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
499 At revision 7. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
500 $ svn mkdir -m "baseline" $SVNREPOURL/trunk |
14820
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 8. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
503 $ svn copy -m "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
504 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
505 Committed revision 9. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
506 $ svn co --quiet "$SVNREPOURL"/branch tempwc |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
507 $ cd tempwc |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
508 $ echo "something old" > somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
509 $ svn add somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
510 A somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
511 $ svn ci -m 'Something old' |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
512 Adding somethingold |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
513 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
514 Committed revision 10. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
515 $ svn rm -m "remove branch" $SVNREPOURL/branch |
14820
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 11. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
518 $ svn copy -m "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
519 |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
520 Committed revision 12. |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
521 $ svn up -q |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
522 $ echo "something new" > somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
523 $ svn add somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
524 A somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
525 $ svn ci -m 'Something new' |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
526 Adding somethingnew |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
527 Transmitting file data . |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
528 Committed revision 13. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
529 $ cd .. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
530 $ rm -rf tempwc |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
531 $ svn co "$SVNREPOURL/branch"@10 recreated |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
532 A recreated/somethingold (glob) |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
533 Checked out revision 10. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
534 $ echo "recreated = [svn] $SVNREPOURL/branch" >> .hgsub |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
535 $ hg ci -m addsub |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
536 $ cd recreated |
15607
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
537 $ svn up -q |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
538 $ cd .. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
539 $ hg ci -m updatesub |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
540 $ 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
|
541 D *recreated/somethingnew (glob) |
fab28a577a38
test-svn-subrepo: fix reference output for svn 1.7
Patrick Mezard <pmezard@gmail.com>
parents:
15372
diff
changeset
|
542 A *recreated/somethingold (glob) |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
543 Checked out revision 10. |
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
544 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21404
ca275f7ec576
update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com>
parents:
21024
diff
changeset
|
545 (leaving bookmark other) |
15282
d4addef0ec74
tests: don't use 'test -e'
Mads Kiilerich <mads@kiilerich.com>
parents:
14820
diff
changeset
|
546 $ test -f recreated/somethingold |
14820
7ef125fa9b35
subrepo: correct revision in svn checkout
Eli Carter <eli.carter@tektronix.com>
parents:
14664
diff
changeset
|
547 |
16450
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
548 Test archive |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
549 |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
550 $ hg archive -S ../archive-all --debug |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
551 archiving: 0/2 files (0.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
552 archiving: .hgsub 1/2 files (50.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
553 archiving: .hgsubstate 2/2 files (100.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
554 archiving (obstruct): 0/1 files (0.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
555 archiving (obstruct): 1/1 files (100.00%) |
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18109
diff
changeset
|
556 archiving (recreated): 0/1 files (0.00%) |
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18109
diff
changeset
|
557 archiving (recreated): 1/1 files (100.00%) |
16450
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
558 archiving (s): 0/2 files (0.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
559 archiving (s): 1/2 files (50.00%) |
c9c8c9053119
archive: make it work with svn subrepos (issue3308)
Patrick Mezard <patrick@mezard.eu>
parents:
15607
diff
changeset
|
560 archiving (s): 2/2 files (100.00%) |
16527
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
561 |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
562 $ hg archive -S ../archive-exclude --debug -X **old |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
563 archiving: 0/2 files (0.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
564 archiving: .hgsub 1/2 files (50.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
565 archiving: .hgsubstate 2/2 files (100.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
566 archiving (obstruct): 0/1 files (0.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
567 archiving (obstruct): 1/1 files (100.00%) |
18364
6252b4f1c4b4
subrepos: process subrepos in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18109
diff
changeset
|
568 archiving (recreated): 0 files |
17108
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
569 archiving (s): 0/2 files (0.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
570 archiving (s): 1/2 files (50.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
571 archiving (s): 2/2 files (100.00%) |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
572 $ find ../archive-exclude | sort |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
573 ../archive-exclude |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
574 ../archive-exclude/.hg_archival.txt |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
575 ../archive-exclude/.hgsub |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
576 ../archive-exclude/.hgsubstate |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
577 ../archive-exclude/obstruct |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
578 ../archive-exclude/obstruct/other |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
579 ../archive-exclude/s |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
580 ../archive-exclude/s/alpha |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
581 ../archive-exclude/s/dir |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
582 ../archive-exclude/s/dir/epsilon.py |
1894dac619de
subrepo: propagate matcher to subrepos when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17033
diff
changeset
|
583 |
16527
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
584 Test forgetting files, not implemented in svn subrepo, used to |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
585 traceback |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
586 |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
587 #if no-windows |
16527
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
588 $ hg forget 'notafile*' |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
589 notafile*: No such file or directory |
17a1f7690b49
subrepo: fix default implementation of forget() (issue3404)
Patrick Mezard <patrick@mezard.eu>
parents:
16526
diff
changeset
|
590 [1] |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
591 #else |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
592 $ hg forget 'notafile' |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
593 notafile: * (glob) |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
594 [1] |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
595 #endif |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
596 |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
597 Test a subrepo referencing a just moved svn path. Last commit rev will |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
598 be different from the revision, and the path will be different as |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
599 well. |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
600 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
601 $ cd "$WCROOT" |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
602 $ svn up > /dev/null |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
603 $ mkdir trunk/subdir branches |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
604 $ echo a > trunk/subdir/a |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
605 $ svn add trunk/subdir branches |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
606 A trunk/subdir (glob) |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
607 A trunk/subdir/a (glob) |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
608 A branches |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
609 $ svn ci -m addsubdir |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
610 Adding branches |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
611 Adding trunk/subdir (glob) |
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
612 Adding trunk/subdir/a (glob) |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
613 Transmitting file data . |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
614 Committed revision 14. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
615 $ svn cp -m branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
616 |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
617 Committed revision 15. |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
618 $ cd .. |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
619 |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
620 $ hg init repo2 |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
621 $ cd repo2 |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
622 $ svn co $SVNREPOURL/branches/somebranch/subdir |
17032
7dd82e0c43ea
test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
parents:
16898
diff
changeset
|
623 A subdir/a (glob) |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
624 Checked out revision 15. |
17033
0413f68da85c
tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com>
parents:
17032
diff
changeset
|
625 $ echo "subdir = [svn] $SVNREPOURL/branches/somebranch/subdir" > .hgsub |
16554
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
626 $ hg add .hgsub |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
627 $ hg ci -m addsub |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
628 $ hg up null |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
629 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
630 $ hg up |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
631 A *subdir/a (glob) |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
632 Checked out revision 15. |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
633 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ae2664ee0223
subrepo/svn: fix checked out rev number retrieval (issue2968)
Patrick Mezard <patrick@mezard.eu>
parents:
16530
diff
changeset
|
634 $ cd .. |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
635 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
636 Test sanitizing ".hg/hgrc" in subrepo |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
637 |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
638 $ cd sub/t |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
639 $ hg update -q -C tip |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
640 $ cd s |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
641 $ mkdir .hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
642 $ echo '.hg/hgrc in svn repo' > .hg/hgrc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
643 $ mkdir -p sub/.hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
644 $ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
645 $ svn add .hg sub |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
646 A .hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
647 A .hg/hgrc (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
648 A sub |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
649 A sub/.hg (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
650 A sub/.hg/hgrc (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
651 $ svn ci -m 'add .hg/hgrc to be sanitized at hg update' |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
652 Adding .hg |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
653 Adding .hg/hgrc (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
654 Adding sub |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
655 Adding sub/.hg (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
656 Adding sub/.hg/hgrc (glob) |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
657 Transmitting file data .. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
658 Committed revision 16. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
659 $ svn up -q |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
660 $ cd .. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
661 $ hg commit -S -m 'commit with svn revision including .hg/hgrc' |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
662 $ grep ' s$' .hgsubstate |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
663 16 s |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
664 $ cd .. |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
665 |
21566
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
666 $ hg -R tc pull -u -q 2>&1 | sort |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
667 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg' (glob) |
a01988cd9b61
subrepo: make "_sanitize()" take absolute path to the root of subrepo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21564
diff
changeset
|
668 warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg' (glob) |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
669 $ cd tc |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
670 $ grep ' s$' .hgsubstate |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
671 16 s |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21585
diff
changeset
|
672 $ test -f s/.hg/hgrc |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
673 [1] |
21930
a5168eb9b2bc
tests: cat error messages are different on Solaris
Danek Duvall <danek.duvall@oracle.com>
parents:
21585
diff
changeset
|
674 $ test -f s/sub/.hg/hgrc |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
675 [1] |
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
676 |
21567
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
677 Test that sanitizing is omitted in meta data area: |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
678 |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
679 $ mkdir s/.svn/.hg |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
680 $ echo '.hg/hgrc in svn metadata area' > s/.svn/.hg/hgrc |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
681 $ hg update -q -C '.^1' |
5900bc09e684
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21566
diff
changeset
|
682 |
21564
2e91d4964ecd
subrepo: make "_sanitize()" work
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21024
diff
changeset
|
683 $ cd ../.. |