Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 17035:ba0286e149aa stable
subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968)
ae2664ee0223 introduced "svn info TARGET@REV" to determine if a certain
path exists in the specified revision, but in svn 1.5 the error message
"Not a valid URL" yields exit code 0 so the error is not caught.
Use "svn list TARGET@REV" instead which works with svn 1.5 and is even
faster in some situations.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 26 Jun 2012 14:27:33 +0200 |
| parents | 8ad08dcab7d9 |
| children | ab4644c3064f 54714fc4ae33 |
comparison
equal
deleted
inserted
replaced
| 17034:75fd9d1cf638 | 17035:ba0286e149aa |
|---|---|
| 728 # Last committed rev is not the same than rev. We would | 728 # Last committed rev is not the same than rev. We would |
| 729 # like to take lastrev but we do not know if the subrepo | 729 # like to take lastrev but we do not know if the subrepo |
| 730 # URL exists at lastrev. Test it and fallback to rev it | 730 # URL exists at lastrev. Test it and fallback to rev it |
| 731 # is not there. | 731 # is not there. |
| 732 try: | 732 try: |
| 733 self._svncommand(['info', '%s@%s' % (self._state[0], lastrev)]) | 733 self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) |
| 734 return lastrev | 734 return lastrev |
| 735 except error.Abort: | 735 except error.Abort: |
| 736 pass | 736 pass |
| 737 return rev | 737 return rev |
| 738 | 738 |