Show More
@@ -420,6 +420,10 b' class hgsubrepo(abstractsubrepo):' | |||||
420 | return self._repo._checknested(self._repo.wjoin(path)) |
|
420 | return self._repo._checknested(self._repo.wjoin(path)) | |
421 |
|
421 | |||
422 | def commit(self, text, user, date): |
|
422 | def commit(self, text, user, date): | |
|
423 | # don't bother committing in the subrepo if it's only been | |||
|
424 | # updated | |||
|
425 | if not self.dirty(True): | |||
|
426 | return self._repo['.'].hex() | |||
423 | self._repo.ui.debug("committing subrepo %s\n" % subrelpath(self)) |
|
427 | self._repo.ui.debug("committing subrepo %s\n" % subrelpath(self)) | |
424 | n = self._repo.commit(text, user, date) |
|
428 | n = self._repo.commit(text, user, date) | |
425 | if not n: |
|
429 | if not n: |
@@ -348,3 +348,14 b' handle subrepos safely on qrecord' | |||||
348 | % debugsub should be empty |
|
348 | % debugsub should be empty | |
349 |
|
349 | |||
350 | $ cd .. |
|
350 | $ cd .. | |
|
351 | ||||
|
352 | ||||
|
353 | correctly handle subrepos with patch queues | |||
|
354 | $ mkrepo repo-subrepo-with-queue | |||
|
355 | $ mksubrepo sub | |||
|
356 | adding a | |||
|
357 | $ hg -R sub qnew sub0.diff | |||
|
358 | $ echo sub = sub >> .hgsub | |||
|
359 | $ hg add .hgsub | |||
|
360 | $ hg qnew 0.diff | |||
|
361 | committing subrepository sub |
General Comments 0
You need to be logged in to leave comments.
Login now