Mercurial > hg
comparison mercurial/subrepo.py @ 17036:ab4644c3064f
merge with crew-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 26 Jun 2012 14:32:20 +0200 |
| parents | 6c05eebd9fab ba0286e149aa |
| children | 1894dac619de |
comparison
equal
deleted
inserted
replaced
| 17033:0413f68da85c | 17036:ab4644c3064f |
|---|---|
| 730 # Last committed rev is not the same than rev. We would | 730 # Last committed rev is not the same than rev. We would |
| 731 # like to take lastrev but we do not know if the subrepo | 731 # like to take lastrev but we do not know if the subrepo |
| 732 # URL exists at lastrev. Test it and fallback to rev it | 732 # URL exists at lastrev. Test it and fallback to rev it |
| 733 # is not there. | 733 # is not there. |
| 734 try: | 734 try: |
| 735 self._svncommand(['info', '%s@%s' % (self._state[0], lastrev)]) | 735 self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) |
| 736 return lastrev | 736 return lastrev |
| 737 except error.Abort: | 737 except error.Abort: |
| 738 pass | 738 pass |
| 739 return rev | 739 return rev |
| 740 | 740 |