##// END OF EJS Templates
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)...
Pierre-Yves David -
r18493:fe671070 stable
parent child Browse files
Show More
@@ -558,7 +558,7 b' def _outgoing(ui, repo, dest, opts):'
558 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
558 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
559
559
560 other = peer(repo, opts, dest)
560 other = peer(repo, opts, dest)
561 outgoing = discovery.findcommonoutgoing(repo, other, revs,
561 outgoing = discovery.findcommonoutgoing(repo.unfiltered(), other, revs,
562 force=opts.get('force'))
562 force=opts.get('force'))
563 o = outgoing.missing
563 o = outgoing.missing
564 if not o:
564 if not o:
@@ -318,11 +318,38 b' Exchange Test'
318 Destination repo does not have any data
318 Destination repo does not have any data
319 ---------------------------------------
319 ---------------------------------------
320
320
321 Simple incoming test
322
323 $ hg init tmpc
324 $ cd tmpc
325 $ hg incoming ../tmpb
326 comparing with ../tmpb
327 changeset: 0:1f0dee641bb7
328 user: test
329 date: Thu Jan 01 00:00:00 1970 +0000
330 summary: add a
331
332 changeset: 1:7c3bad9141dc
333 user: test
334 date: Thu Jan 01 00:00:00 1970 +0000
335 summary: add b
336
337 changeset: 2:245bde4270cd
338 user: test
339 date: Thu Jan 01 00:00:00 1970 +0000
340 summary: add original_c
341
342 changeset: 6:6f9641995072
343 tag: tip
344 parent: 1:7c3bad9141dc
345 user: test
346 date: Thu Jan 01 00:00:00 1970 +0000
347 summary: add n3w_3_c
348
349
321 Try to pull markers
350 Try to pull markers
322 (extinct changeset are excluded but marker are pushed)
351 (extinct changeset are excluded but marker are pushed)
323
352
324 $ hg init tmpc
325 $ cd tmpc
326 $ hg pull ../tmpb
353 $ hg pull ../tmpb
327 pulling from ../tmpb
354 pulling from ../tmpb
328 requesting all changes
355 requesting all changes
@@ -663,6 +690,16 b' Do not warn about new head when the new '
663 $ mkcommit obsolete_e
690 $ mkcommit obsolete_e
664 created new head
691 created new head
665 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
692 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
693 $ hg outgoing ../tmpf # parasite hg outgoing testin
694 comparing with ../tmpf
695 searching for changes
696 changeset: 6:3de5eca88c00
697 tag: tip
698 parent: 3:6f9641995072
699 user: test
700 date: Thu Jan 01 00:00:00 1970 +0000
701 summary: add obsolete_e
702
666 $ hg push ../tmpf
703 $ hg push ../tmpf
667 pushing to ../tmpf
704 pushing to ../tmpf
668 searching for changes
705 searching for changes
General Comments 0
You need to be logged in to leave comments. Login now