Show More
@@ -34,7 +34,7 b' qnew on repo w/svn subrepo' | |||
|
34 | 34 | Checked out revision 1. |
|
35 | 35 | $ echo 'sub = [svn]sub' >> .hgsub |
|
36 | 36 | $ hg add .hgsub |
|
37 | $ hg status -S | |
|
37 | $ hg status -S -X '**/format' | |
|
38 | 38 | A .hgsub |
|
39 | 39 | ? sub/.svn/entries |
|
40 | 40 | $ hg qnew -m0 0.diff |
@@ -44,7 +44,7 b' qnew on repo w/svn subrepo' | |||
|
44 | 44 | $ svn add a |
|
45 | 45 | A a |
|
46 | 46 | $ svn st |
|
47 | A a | |
|
47 | A* a (glob) | |
|
48 | 48 | $ cd .. |
|
49 | 49 | $ hg status -S # doesn't show status for svn subrepos (yet) |
|
50 | 50 | $ hg qnew -m1 1.diff |
@@ -126,7 +126,7 b' change file in svn and hg, commit' | |||
|
126 | 126 | add an unrelated revision in svn and update the subrepo to without |
|
127 | 127 | bringing any changes. |
|
128 | 128 | |
|
129 |
$ svn mkdir |
|
|
129 | $ svn mkdir "$SVNREPO/unrelated" -m 'create unrelated' | |
|
130 | 130 | |
|
131 | 131 | Committed revision 4. |
|
132 | 132 | $ svn up s |
@@ -273,11 +273,11 b' Check hg update --clean' | |||
|
273 | 273 | $ echo c1 > f2 |
|
274 | 274 | $ svn add f1 -q |
|
275 | 275 | $ svn status |
|
276 |
? |
|
|
277 |
X |
|
|
278 |
? |
|
|
279 |
M |
|
|
280 |
A |
|
|
276 | ? * a (glob) | |
|
277 | X * externals (glob) | |
|
278 | ? * f2 (glob) | |
|
279 | M * alpha (glob) | |
|
280 | A * f1 (glob) | |
|
281 | 281 | |
|
282 | 282 | Performing status on external item at 'externals' |
|
283 | 283 | $ cd ../.. |
@@ -290,9 +290,9 b' Check hg update --clean' | |||
|
290 | 290 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
291 | 291 | $ cd t/s |
|
292 | 292 | $ svn status |
|
293 |
? |
|
|
294 |
X |
|
|
295 |
? |
|
|
296 |
? |
|
|
293 | ? * a (glob) | |
|
294 | X * externals (glob) | |
|
295 | ? * f1 (glob) | |
|
296 | ? * f2 (glob) | |
|
297 | 297 | |
|
298 | 298 | Performing status on external item at 'externals' |
General Comments 0
You need to be logged in to leave comments.
Login now