Show More
@@ -266,8 +266,9 b' class hgsubrepo(object):' | |||||
266 | if not c.sub(s).push(force): |
|
266 | if not c.sub(s).push(force): | |
267 | return False |
|
267 | return False | |
268 |
|
268 | |||
269 | self._repo.ui.status(_('pushing subrepo %s\n') % self._path) |
|
|||
270 | dsturl = _abssource(self._repo, True) |
|
269 | dsturl = _abssource(self._repo, True) | |
|
270 | self._repo.ui.status(_('pushing subrepo %s to %s\n') % | |||
|
271 | (self._path, dsturl)) | |||
271 | other = hg.repository(self._repo.ui, dsturl) |
|
272 | other = hg.repository(self._repo.ui, dsturl) | |
272 | return self._repo.push(other, force) |
|
273 | return self._repo.push(other, force) | |
273 |
|
274 |
@@ -151,13 +151,13 b' path t' | |||||
151 | % push |
|
151 | % push | |
152 | committing subrepository t |
|
152 | committing subrepository t | |
153 | pushing ...sub/t |
|
153 | pushing ...sub/t | |
154 |
pushing ...sub |
|
154 | pushing ...sub/t/s/ss | |
155 | searching for changes |
|
155 | searching for changes | |
156 | no changes found |
|
156 | no changes found | |
157 |
pushing ...sub |
|
157 | pushing ...sub/t/s | |
158 | searching for changes |
|
158 | searching for changes | |
159 | no changes found |
|
159 | no changes found | |
160 |
pushing ...sub |
|
160 | pushing ...sub/t/t | |
161 | searching for changes |
|
161 | searching for changes | |
162 | adding changesets |
|
162 | adding changesets | |
163 | adding manifests |
|
163 | adding manifests | |
@@ -172,23 +172,23 b' added 1 changesets with 1 changes to 1 f' | |||||
172 | committing subrepository s |
|
172 | committing subrepository s | |
173 | abort: push creates new remote heads on branch 'default'! |
|
173 | abort: push creates new remote heads on branch 'default'! | |
174 | pushing ...sub/t |
|
174 | pushing ...sub/t | |
175 |
pushing ...sub |
|
175 | pushing ...sub/t/s/ss | |
176 | searching for changes |
|
176 | searching for changes | |
177 | no changes found |
|
177 | no changes found | |
178 |
pushing ...sub |
|
178 | pushing ...sub/t/s | |
179 | searching for changes |
|
179 | searching for changes | |
180 | (did you forget to merge? use push -f to force) |
|
180 | (did you forget to merge? use push -f to force) | |
181 | pushing ...sub/t |
|
181 | pushing ...sub/t | |
182 |
pushing ...sub |
|
182 | pushing ...sub/t/s/ss | |
183 | searching for changes |
|
183 | searching for changes | |
184 | no changes found |
|
184 | no changes found | |
185 |
pushing ...sub |
|
185 | pushing ...sub/t/s | |
186 | searching for changes |
|
186 | searching for changes | |
187 | adding changesets |
|
187 | adding changesets | |
188 | adding manifests |
|
188 | adding manifests | |
189 | adding file changes |
|
189 | adding file changes | |
190 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
190 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
191 |
pushing ...sub |
|
191 | pushing ...sub/t/t | |
192 | searching for changes |
|
192 | searching for changes | |
193 | no changes found |
|
193 | no changes found | |
194 | searching for changes |
|
194 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now