[PATCH] test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan
alexandrul.ct at gmail.com
Tue Jun 26 10:04:47 CDT 2012
On 2012-06-26 17:01, Mads Kiilerich wrote:
> So subversion on your machine shows the absolute path with the top level stripped of instead of showing a simple relative path. That makes it look even more like a subversion bug. Can you confirm that it works for you with 1.7 and perhaps find a bug report or changelog of the fix?
Works without issues in SVN 1.7.5
I couldn't find anything related to this behavior in the changelogs,
but I'm not sure how would this be worded in the first place.
> Please also try with the temp folder set to d:/temp and c:/temp and see if that makes a difference.
No difference.
It seems that SVN 1.6.x is simply more verbose on windows,
with this patch the test still passes with SVN 1.7.5.
However, with SVN 1.6.17 the "--subrepos" commands
are the only ones that are eating "C:\Users\":
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -98,7 +98,7 @@
update: (current)
$ hg commit --subrepos -m 'Message!' | grep -v Updating
committing subrepository s
- Sending*s/alpha (glob)
+ Sending s/alpha (glob)
Transmitting file data .
Committed revision 3.
@@ -292,7 +292,7 @@
3
$ cd ..
$ hg update 1
- U *s/alpha (glob)
+ U s/alpha (glob)
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -330,7 +330,7 @@
2M
$ cd ..
$ hg update --clean tip
- U *s/alpha (glob)
+ U s/alpha (glob)
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -384,8 +384,8 @@
Sticky repository, update --clean
$ hg update --clean tip | grep -v 's[/\]externals[/\]other'
- U *s/alpha (glob)
- U *s (glob)
+ U s/alpha (glob)
+ U s (glob)
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -422,8 +422,8 @@
A dir
A dir/epsilon.py (glob)
$ svn ci -m 'Add dir/epsilon.py'
- Adding *dir (glob)
- Adding *dir/epsilon.py (glob)
+ Adding dir (glob)
+ Adding dir/epsilon.py (glob)
Transmitting file data .
Committed revision 6.
$ cd ../..
@@ -443,7 +443,7 @@
created new head
$ echo pyc > s/dir/epsilon.pyc
$ hg up 1
- D *s/dir (glob)
+ D s/dir (glob)
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -530,8 +530,8 @@
$ cd ..
$ hg ci -m updatesub
$ hg up -r-2
- D *recreated/somethingnew (glob)
- A *recreated/somethingold (glob)
+ D recreated/somethingnew (glob)
+ A recreated/somethingold (glob)
Checked out revision 10.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ test -f recreated/somethingold
SVN 1.6.17 output:
--- d:\hg\tests\test-subrepo-svn.t
+++ d:\hg\tests\test-subrepo-svn.t.err
@@ -98,7 +98,7 @@
update: (current)
$ hg commit --subrepos -m 'Message!' | grep -v Updating
committing subrepository s
- Sending s/alpha (glob)
+ Sending Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\sub\t\s\alpha
Transmitting file data .
Committed revision 3.
@@ -292,7 +292,7 @@
3
$ cd ..
$ hg update 1
- U s/alpha (glob)
+ U C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\sub\t\s\alpha
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -330,7 +330,7 @@
2M
$ cd ..
$ hg update --clean tip
- U s/alpha (glob)
+ U C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\sub\t\s\alpha
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -384,8 +384,8 @@
Sticky repository, update --clean
$ hg update --clean tip | grep -v 's[/\]externals[/\]other'
- U s/alpha (glob)
- U s (glob)
+ U C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\sub\t\s\alpha
+ U C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\sub\t\s
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -422,8 +422,8 @@
A dir
A dir/epsilon.py (glob)
$ svn ci -m 'Add dir/epsilon.py'
- Adding dir (glob)
- Adding dir/epsilon.py (glob)
+ Adding src\dir
+ Adding src\dir\epsilon.py
Transmitting file data .
Committed revision 6.
$ cd ../..
@@ -443,7 +443,7 @@
created new head
$ echo pyc > s/dir/epsilon.pyc
$ hg up 1
- D s/dir (glob)
+ D C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\rebaserepo\s\dir
Fetching external item into '*s/externals'* (glob)
Checked out external at revision 1.
@@ -485,7 +485,7 @@
$ hg ci --subrepos -m cleanup | grep -v Updating
committing subrepository obstruct
- Sending obstruct/other (glob)
+ Sending Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\rebaserepo\obstruct\other
Transmitting file data .
Committed revision 7.
At revision 7.
@@ -530,8 +530,8 @@
$ cd ..
$ hg ci -m updatesub
$ hg up -r-2
- D recreated/somethingnew (glob)
- A recreated/somethingold (glob)
+ D C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\rebaserepo\recreated\somethingnew
+ A C:\Users\Administrator\AppData\Local\Temp\hgtests._0uv18\test-subrepo-svn.t\rebaserepo\recreated\somethingold
Checked out revision 10.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ test -f recreated/somethingold
Maybe it's not worth the effort, SVN 1.6.x being old enough (at least for me).
Have a nice day,
Eduard
More information about the Mercurial-devel
mailing list