Skip to content
Snippets Groups Projects
Commit 927e3940 authored by Patrick Mezard's avatar Patrick Mezard
Browse files

subrepo: fix update -C with svn subrepos when cwd != repo.root

parent 551856de
No related branches found
No related tags found
No related merge requests found
......@@ -591,7 +591,7 @@
def get(self, state, overwrite=False):
if overwrite:
self._svncommand(['revert', '--recursive', self._path])
self._svncommand(['revert', '--recursive'])
status = self._svncommand(['checkout', state[0], '--revision', state[1]])
if not re.search('Checked out revision [0-9]+.', status):
raise util.Abort(status.splitlines()[-1])
......
......@@ -280,6 +280,6 @@
A f1
Performing status on external item at 'externals'
$ cd ..
$ hg update -C
$ cd ../..
$ hg -R t update -C
......@@ -285,6 +285,6 @@
Fetching external item into '$TESTTMP/sub/t/s/externals'
Fetching external item into 't/s/externals'
Checked out external at revision 1.
Checked out revision 3.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
......@@ -287,8 +287,8 @@
Checked out external at revision 1.
Checked out revision 3.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd s
$ cd t/s
$ svn status
? a
X externals
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment