##// END OF EJS Templates
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()...
Matt Harbison -
r24876:b5513ee8 stable
parent child Browse files
Show More
@@ -881,6 +881,10 b' class hgsubrepo(abstractsubrepo):'
881
881
882 @annotatesubrepoerror
882 @annotatesubrepoerror
883 def incoming(self, ui, source, opts):
883 def incoming(self, ui, source, opts):
884 if 'rev' in opts or 'branch' in opts:
885 opts = copy.copy(opts)
886 opts.pop('rev', None)
887 opts.pop('branch', None)
884 return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts)
888 return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts)
885
889
886 @annotatesubrepoerror
890 @annotatesubrepoerror
@@ -689,6 +689,24 b' pull'
689
689
690 should pull t
690 should pull t
691
691
692 $ hg incoming -S -r `hg log -r tip -T "{node|short}"`
693 comparing with $TESTTMP/t (glob)
694 no changes found
695 comparing with $TESTTMP/t/s
696 searching for changes
697 no changes found
698 comparing with $TESTTMP/t/s/ss
699 searching for changes
700 no changes found
701 comparing with $TESTTMP/t/t
702 searching for changes
703 changeset: 5:52c0adc0515a
704 tag: tip
705 user: test
706 date: Thu Jan 01 00:00:00 1970 +0000
707 summary: 13
708
709
692 $ hg up
710 $ hg up
693 pulling subrepo t from $TESTTMP/t/t
711 pulling subrepo t from $TESTTMP/t/t
694 searching for changes
712 searching for changes
General Comments 0
You need to be logged in to leave comments. Login now