Show More
@@ -591,7 +591,7 b' class svnsubrepo(abstractsubrepo):' | |||||
591 |
|
591 | |||
592 | def get(self, state, overwrite=False): |
|
592 | def get(self, state, overwrite=False): | |
593 | if overwrite: |
|
593 | if overwrite: | |
594 |
self._svncommand(['revert', '--recursive' |
|
594 | self._svncommand(['revert', '--recursive']) | |
595 | status = self._svncommand(['checkout', state[0], '--revision', state[1]]) |
|
595 | status = self._svncommand(['checkout', state[0], '--revision', state[1]]) | |
596 | if not re.search('Checked out revision [0-9]+.', status): |
|
596 | if not re.search('Checked out revision [0-9]+.', status): | |
597 | raise util.Abort(status.splitlines()[-1]) |
|
597 | raise util.Abort(status.splitlines()[-1]) |
@@ -280,15 +280,15 b' Check hg update --clean' | |||||
280 | A f1 |
|
280 | A f1 | |
281 |
|
281 | |||
282 | Performing status on external item at 'externals' |
|
282 | Performing status on external item at 'externals' | |
283 | $ cd .. |
|
283 | $ cd ../.. | |
284 | $ hg update -C |
|
284 | $ hg -R t update -C | |
285 |
|
285 | |||
286 |
Fetching external item into ' |
|
286 | Fetching external item into 't/s/externals' | |
287 | Checked out external at revision 1. |
|
287 | Checked out external at revision 1. | |
288 |
|
288 | |||
289 | Checked out revision 3. |
|
289 | Checked out revision 3. | |
290 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
290 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
291 | $ cd s |
|
291 | $ cd t/s | |
292 | $ svn status |
|
292 | $ svn status | |
293 | ? a |
|
293 | ? a | |
294 | X externals |
|
294 | X externals |
General Comments 0
You need to be logged in to leave comments.
Login now