Show More
@@ -217,8 +217,8 b' class hgsubrepo(object):' | |||
|
217 | 217 | self._repo.lookup(revision) |
|
218 | 218 | except error.RepoError: |
|
219 | 219 | self._repo._subsource = source |
|
220 | self._repo.ui.status(_('pulling subrepo %s\n') % self._path) | |
|
221 | 220 | srcurl = _abssource(self._repo) |
|
221 | self._repo.ui.status(_('pulling subrepo %s from %s\n') % (self._path, srcurl)) | |
|
222 | 222 | other = hg.repository(self._repo.ui, srcurl) |
|
223 | 223 | self._repo.pull(other) |
|
224 | 224 |
@@ -78,7 +78,7 b' cat t/t' | |||
|
78 | 78 | |
|
79 | 79 | echo % clone |
|
80 | 80 | cd .. |
|
81 | hg clone t tc | |
|
81 | hg clone t tc | sed 's|from .*/sub|from .../sub|g' | |
|
82 | 82 | cd tc |
|
83 | 83 | hg debugsub |
|
84 | 84 | |
@@ -102,7 +102,8 b' hg ci -m13' | |||
|
102 | 102 | echo % pull |
|
103 | 103 | cd ../tc |
|
104 | 104 | hg pull | sed 's/ .*sub/ ...sub/g' |
|
105 |
|
|
|
105 | # should pull t | |
|
106 | hg up | sed 's|from .*/sub|from .../sub|g' | |
|
106 | 107 | cat t/t |
|
107 | 108 | |
|
108 | 109 | echo % bogus subrepo path aborts |
@@ -108,19 +108,19 b' t3' | |||
|
108 | 108 | >>>>>>> other |
|
109 | 109 | % clone |
|
110 | 110 | updating to branch default |
|
111 | pulling subrepo s | |
|
111 | pulling subrepo s from .../sub/t/s | |
|
112 | 112 | requesting all changes |
|
113 | 113 | adding changesets |
|
114 | 114 | adding manifests |
|
115 | 115 | adding file changes |
|
116 | 116 | added 4 changesets with 5 changes to 3 files |
|
117 | pulling subrepo ss | |
|
117 | pulling subrepo ss from .../sub/t/s/ss | |
|
118 | 118 | requesting all changes |
|
119 | 119 | adding changesets |
|
120 | 120 | adding manifests |
|
121 | 121 | adding file changes |
|
122 | 122 | added 1 changesets with 1 changes to 1 files |
|
123 | pulling subrepo t | |
|
123 | pulling subrepo t from .../sub/t/t | |
|
124 | 124 | requesting all changes |
|
125 | 125 | adding changesets |
|
126 | 126 | adding manifests |
@@ -197,7 +197,7 b' adding manifests' | |||
|
197 | 197 | adding file changes |
|
198 | 198 | added 1 changesets with 1 changes to 1 files |
|
199 | 199 | (run 'hg update' to get a working copy) |
|
200 | pulling subrepo t | |
|
200 | pulling subrepo t from .../sub/t/t | |
|
201 | 201 | searching for changes |
|
202 | 202 | adding changesets |
|
203 | 203 | adding manifests |
General Comments 0
You need to be logged in to leave comments.
Login now