##// END OF EJS Templates
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()...
Matt Harbison -
r24875:5135c2be stable
parent child Browse files
Show More
@@ -873,6 +873,10 b' class hgsubrepo(abstractsubrepo):'
873
873
874 @annotatesubrepoerror
874 @annotatesubrepoerror
875 def outgoing(self, ui, dest, opts):
875 def outgoing(self, ui, dest, opts):
876 if 'rev' in opts or 'branch' in opts:
877 opts = copy.copy(opts)
878 opts.pop('rev', None)
879 opts.pop('branch', None)
876 return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts)
880 return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts)
877
881
878 @annotatesubrepoerror
882 @annotatesubrepoerror
@@ -598,6 +598,26 b' committing into a subrepo makes its stor'
598
598
599 $ echo foo >> s/ss/a
599 $ echo foo >> s/ss/a
600 $ hg -R s/ss commit -m 'test dirty store detection'
600 $ hg -R s/ss commit -m 'test dirty store detection'
601
602 $ hg out -S -r `hg log -r tip -T "{node|short}"`
603 comparing with $TESTTMP/t (glob)
604 searching for changes
605 no changes found
606 comparing with $TESTTMP/t/s
607 searching for changes
608 no changes found
609 comparing with $TESTTMP/t/s/ss
610 searching for changes
611 changeset: 1:79ea5566a333
612 tag: tip
613 user: test
614 date: Thu Jan 01 00:00:00 1970 +0000
615 summary: test dirty store detection
616
617 comparing with $TESTTMP/t/t
618 searching for changes
619 no changes found
620
601 $ hg push
621 $ hg push
602 pushing to $TESTTMP/t (glob)
622 pushing to $TESTTMP/t (glob)
603 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
623 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
General Comments 0
You need to be logged in to leave comments. Login now