tests/test-treediscovery.t
author Simon Heimberg <simohe@besonet.ch>
Sun, 09 Feb 2014 00:26:01 +0100
changeset 20426 00f2d29308db
parent 20117 aa9385f983fa
child 20522 0e2877f8605d
permissions -rw-r--r--
tests: test that the pid returned by `hg serve` looks reasonable This failed on windows before win32.spawndetached has been fixed. The process name was "cmd.exe" and not "hg.exe" or "python.exe".
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17539
bc7377160fa7 tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 17466
diff changeset
     1
  $ "$TESTDIR/hghave" killdaemons || exit 80
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 14831
diff changeset
     2
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     3
Tests discovery against servers without getbundle support:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     4
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     5
  $ CAP=getbundle
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
     6
  $ . "$TESTDIR/notcapable"
14200
dc733eec9169 test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents: 14199
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
dc733eec9169 test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents: 14199
diff changeset
     8
  > [ui]
dc733eec9169 test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents: 14199
diff changeset
     9
  > logtemplate="{rev} {node|short}: {desc} {branches}\n"
dc733eec9169 test-treediscovery: fix escaping for both dash and bash
Martin Geisler <mg@lazybytes.net>
parents: 14199
diff changeset
    10
  > EOF
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    11
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    12
Setup HTTP server control:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    13
14203
b230922eb0c3 check-code: fix checking for sh style in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents: 14200
diff changeset
    14
  $ remote=http://localhost:$HGPORT/
b230922eb0c3 check-code: fix checking for sh style in .t tests
Mads Kiilerich <mads@kiilerich.com>
parents: 14200
diff changeset
    15
  $ export remote
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
    16
  $ tstart() {
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    17
  >   echo '[web]' > $1/.hg/hgrc
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    18
  >   echo 'push_ssl = false' >> $1/.hg/hgrc
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    19
  >   echo 'allow_push = *' >> $1/.hg/hgrc
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    20
  >   hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    21
  >   cat hg.pid >> $DAEMON_PIDS
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    22
  > }
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
    23
  $ tstop() {
17466
d5a3bda6e170 killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents: 16107
diff changeset
    24
  >   "$TESTDIR/killdaemons.py" $DAEMON_PIDS
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    25
  > }
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    26
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    27
Both are empty:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    28
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    29
  $ hg init empty1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    30
  $ hg init empty2
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
    31
  $ tstart empty2
20426
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    32
check if process of pid looks reasonable ('hg' normally, 'python' for run-tests.py -l)
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    33
#if windows
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    34
ps of mingw does not support -p, tasklist is on any windows machine since XP
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    35
  $ tasklist //NH //fi "pid eq `cat hg.pid`" | grep '  '
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    36
  (.* )?(hg|python)\.exe( .*)? (re)
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    37
#else
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    38
  $ ps --no-heading -p `cat hg.pid`
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    39
  (.* )?(hg|python)( .*)? (re)
00f2d29308db tests: test that the pid returned by `hg serve` looks reasonable
Simon Heimberg <simohe@besonet.ch>
parents: 20117
diff changeset
    40
#endif
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    41
  $ hg incoming -R empty1 $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    42
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    43
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    44
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    45
  $ hg outgoing -R empty1 $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    46
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    47
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    48
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    49
  $ hg pull -R empty1 $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    50
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    51
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    52
  $ hg push -R empty1 $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    53
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    54
  no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
    55
  [1]
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
    56
  $ tstop
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    57
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    58
Base repo:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    59
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    60
  $ hg init main
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    61
  $ cd main
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    62
  $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 17539
diff changeset
    63
  $ hg log -G
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    64
  o  11 a19bfa7e7328: r11 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    65
  |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    66
  o  10 8b6bad1512e1: r10 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    67
  |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    68
  o    9 025829e08038: r9 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    69
  |\
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    70
  | o  8 d8f638ac69e9: r8 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    71
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    72
  | o  7 b6b4d315a2ac: r7 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    73
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    74
  | o  6 6c6f5d5f3c11: r6 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    75
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    76
  | o  5 70314b29987d: r5 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    77
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    78
  o |  4 e71dbbc70e03: r4 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    79
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    80
  o |  3 2c8d5d5ec612: r3 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    81
  | |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    82
  o |  2 a7892891da29: r2 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    83
  |/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    84
  o  1 0019a3b924fd: r1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    85
  |
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    86
  o  0 d57206cc072a: r0
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    87
  
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    88
  $ cd ..
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
    89
  $ tstart main
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    90
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    91
Full clone:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    92
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    93
  $ hg clone main full
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    94
  updating to branch default
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    95
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    96
  $ cd full
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    97
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    98
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    99
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   100
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   101
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   102
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   103
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   104
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   105
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   106
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   107
  $ hg pull $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   108
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   109
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   110
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   111
  $ hg push $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   112
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   113
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   114
  no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
   115
  [1]
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   116
  $ cd ..
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   117
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   118
Local is empty:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   119
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   120
  $ cd empty1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   121
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   122
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   123
  0 d57206cc072a: r0 
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   124
  1 0019a3b924fd: r1 
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   125
  2 a7892891da29: r2 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   126
  3 2c8d5d5ec612: r3 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   127
  4 e71dbbc70e03: r4 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   128
  5 70314b29987d: r5 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   129
  6 6c6f5d5f3c11: r6 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   130
  7 b6b4d315a2ac: r7 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   131
  8 d8f638ac69e9: r8 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   132
  9 025829e08038: r9 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   133
  10 8b6bad1512e1: r10 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   134
  11 a19bfa7e7328: r11 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   135
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   136
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   137
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   138
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   139
  $ hg push $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   140
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   141
  no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
   142
  [1]
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   143
  $ hg pull $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   144
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   145
  requesting all changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   146
  adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   147
  adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   148
  adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   149
  added 12 changesets with 24 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   150
  (run 'hg update' to get a working copy)
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   151
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   152
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   153
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   154
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   155
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   156
  $ cd ..
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   157
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   158
Local is subset:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   159
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   160
  $ hg clone main subset --rev name2 ; cd subset
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   161
  adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   162
  adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   163
  adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   164
  added 6 changesets with 12 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   165
  updating to branch name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   166
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   167
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   168
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   169
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   170
  6 a7892891da29: r2 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   171
  7 2c8d5d5ec612: r3 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   172
  8 e71dbbc70e03: r4 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   173
  9 025829e08038: r9 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   174
  10 8b6bad1512e1: r10 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   175
  11 a19bfa7e7328: r11 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   176
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   177
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   178
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   179
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   180
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   181
  $ hg push $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   182
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   183
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   184
  no changes found
16023
90f8b8dd0326 push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents: 15446
diff changeset
   185
  [1]
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   186
  $ hg pull $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   187
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   188
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   189
  adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   190
  adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   191
  adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   192
  added 6 changesets with 12 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   193
  (run 'hg update' to get a working copy)
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   194
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   195
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   196
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   197
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   198
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   199
  $ cd ..
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   200
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   201
Remote is empty:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   202
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   203
  $ tstop ; tstart empty2
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   204
  $ cd main
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   205
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   206
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   207
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   208
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   209
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   210
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   211
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   212
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   213
  0 d57206cc072a: r0 
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   214
  1 0019a3b924fd: r1 
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   215
  2 a7892891da29: r2 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   216
  3 2c8d5d5ec612: r3 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   217
  4 e71dbbc70e03: r4 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   218
  5 70314b29987d: r5 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   219
  6 6c6f5d5f3c11: r6 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   220
  7 b6b4d315a2ac: r7 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   221
  8 d8f638ac69e9: r8 name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   222
  9 025829e08038: r9 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   223
  10 8b6bad1512e1: r10 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   224
  11 a19bfa7e7328: r11 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   225
  $ hg pull $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   226
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   227
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   228
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   229
  $ hg push $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   230
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   231
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   232
  remote: adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   233
  remote: adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   234
  remote: adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   235
  remote: added 12 changesets with 24 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   236
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   237
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   238
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   239
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   240
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   241
  $ cd ..
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   242
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   243
Local is superset:
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   244
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   245
  $ tstop
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   246
  $ hg clone main subset2 --rev name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   247
  adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   248
  adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   249
  adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   250
  added 6 changesets with 12 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   251
  updating to branch name2
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   252
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   253
  $ tstart subset2
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   254
  $ cd main
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   255
  $ hg incoming $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   256
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   257
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   258
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   259
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   260
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   261
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   262
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   263
  2 a7892891da29: r2 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   264
  3 2c8d5d5ec612: r3 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   265
  4 e71dbbc70e03: r4 name1
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   266
  9 025829e08038: r9 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   267
  10 8b6bad1512e1: r10 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   268
  11 a19bfa7e7328: r11 both
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   269
  $ hg pull $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   270
  pulling from http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   271
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   272
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   273
  $ hg push $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   274
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   275
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   276
  abort: push creates new remote branches: both, name1!
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   277
  (use 'hg push --new-branch' to create new remote branches)
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   278
  [255]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   279
  $ hg push $remote --new-branch
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   280
  pushing to http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   281
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   282
  remote: adding changesets
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   283
  remote: adding manifests
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   284
  remote: adding file changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   285
  remote: added 6 changesets with 12 changes to 2 files
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   286
  $ hg outgoing $remote
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   287
  comparing with http://localhost:$HGPORT/
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   288
  searching for changes
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   289
  no changes found
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   290
  [1]
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   291
  $ cd ..
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   292
14410
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   293
Partial pull:
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   294
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   295
  $ tstop ; tstart main
14410
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   296
  $ hg clone $remote partial --rev name2
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   297
  adding changesets
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   298
  adding manifests
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   299
  adding file changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   300
  added 6 changesets with 12 changes to 2 files
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   301
  updating to branch name2
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   302
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   303
  $ cd partial
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   304
  $ hg incoming $remote
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   305
  comparing with http://localhost:$HGPORT/
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   306
  searching for changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   307
  6 a7892891da29: r2 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   308
  7 2c8d5d5ec612: r3 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   309
  8 e71dbbc70e03: r4 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   310
  9 025829e08038: r9 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   311
  10 8b6bad1512e1: r10 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   312
  11 a19bfa7e7328: r11 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   313
  $ hg incoming $remote --rev name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   314
  comparing with http://localhost:$HGPORT/
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   315
  searching for changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   316
  6 a7892891da29: r2 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   317
  7 2c8d5d5ec612: r3 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   318
  8 e71dbbc70e03: r4 name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   319
  $ hg pull $remote --rev name1
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   320
  pulling from http://localhost:$HGPORT/
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   321
  searching for changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   322
  adding changesets
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   323
  adding manifests
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   324
  adding file changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   325
  added 3 changesets with 6 changes to 2 files (+1 heads)
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   326
  (run 'hg heads' to see heads)
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   327
  $ hg incoming $remote
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   328
  comparing with http://localhost:$HGPORT/
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   329
  searching for changes
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   330
  9 025829e08038: r9 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   331
  10 8b6bad1512e1: r10 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   332
  11 a19bfa7e7328: r11 both
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   333
  $ cd ..
afeb14a8128a tests: add tests for partial pulls with treediscovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14203
diff changeset
   334
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   335
Both have new stuff in new named branches:
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   336
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   337
  $ tstop
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   338
  $ hg clone main repo1a --rev name1 -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   339
  $ hg clone repo1a repo1b -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   340
  $ hg clone main repo2a --rev name2 -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   341
  $ hg clone repo2a repo2b -q
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   342
  $ tstart repo1a
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   343
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   344
  $ cd repo2a
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   345
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   346
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   347
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   348
  6 a7892891da29: r2 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   349
  7 2c8d5d5ec612: r3 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   350
  8 e71dbbc70e03: r4 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   351
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   352
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   353
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   354
  2 70314b29987d: r5 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   355
  3 6c6f5d5f3c11: r6 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   356
  4 b6b4d315a2ac: r7 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   357
  5 d8f638ac69e9: r8 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   358
  $ hg push $remote --new-branch
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   359
  pushing to http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   360
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   361
  remote: adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   362
  remote: adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   363
  remote: adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   364
  remote: added 4 changesets with 8 changes to 2 files (+1 heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   365
  $ hg pull $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   366
  pulling from http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   367
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   368
  adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   369
  adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   370
  adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   371
  added 3 changesets with 6 changes to 2 files (+1 heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   372
  (run 'hg heads' to see heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   373
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   374
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   375
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   376
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   377
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   378
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   379
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   380
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   381
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   382
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   383
  $ cd ..
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   384
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   385
  $ tstop ; tstart repo1b
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   386
  $ cd repo2b
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   387
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   388
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   389
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   390
  6 a7892891da29: r2 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   391
  7 2c8d5d5ec612: r3 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   392
  8 e71dbbc70e03: r4 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   393
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   394
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   395
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   396
  2 70314b29987d: r5 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   397
  3 6c6f5d5f3c11: r6 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   398
  4 b6b4d315a2ac: r7 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   399
  5 d8f638ac69e9: r8 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   400
  $ hg pull $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   401
  pulling from http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   402
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   403
  adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   404
  adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   405
  adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   406
  added 3 changesets with 6 changes to 2 files (+1 heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   407
  (run 'hg heads' to see heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   408
  $ hg push $remote --new-branch
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   409
  pushing to http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   410
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   411
  remote: adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   412
  remote: adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   413
  remote: adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   414
  remote: added 4 changesets with 8 changes to 2 files (+1 heads)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   415
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   416
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   417
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   418
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   419
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   420
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   421
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   422
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   423
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   424
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   425
  $ cd ..
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   426
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   427
Both have new stuff in existing named branches:
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   428
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   429
  $ tstop
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   430
  $ rm -r repo1a repo1b repo2a repo2b
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   431
  $ hg clone main repo1a --rev 3 --rev 8 -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   432
  $ hg clone repo1a repo1b -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   433
  $ hg clone main repo2a --rev 4 --rev 7 -q
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   434
  $ hg clone repo2a repo2b -q
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   435
  $ tstart repo1a
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   436
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   437
  $ cd repo2a
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   438
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   439
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   440
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   441
  8 d8f638ac69e9: r8 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   442
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   443
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   444
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   445
  4 e71dbbc70e03: r4 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   446
  $ hg push $remote --new-branch
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   447
  pushing to http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   448
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   449
  remote: adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   450
  remote: adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   451
  remote: adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   452
  remote: added 1 changesets with 2 changes to 2 files
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   453
  $ hg pull $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   454
  pulling from http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   455
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   456
  adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   457
  adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   458
  adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   459
  added 1 changesets with 2 changes to 2 files
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   460
  (run 'hg update' to get a working copy)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   461
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   462
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   463
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   464
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   465
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   466
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   467
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   468
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   469
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   470
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   471
  $ cd ..
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   472
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   473
  $ tstop ; tstart repo1b
14698
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   474
  $ cd repo2b
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   475
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   476
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   477
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   478
  8 d8f638ac69e9: r8 name2
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   479
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   480
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   481
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   482
  4 e71dbbc70e03: r4 name1
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   483
  $ hg pull $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   484
  pulling from http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   485
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   486
  adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   487
  adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   488
  adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   489
  added 1 changesets with 2 changes to 2 files
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   490
  (run 'hg update' to get a working copy)
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   491
  $ hg push $remote --new-branch
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   492
  pushing to http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   493
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   494
  remote: adding changesets
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   495
  remote: adding manifests
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   496
  remote: adding file changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   497
  remote: added 1 changesets with 2 changes to 2 files
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   498
  $ hg incoming $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   499
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   500
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   501
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   502
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   503
  $ hg outgoing $remote
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   504
  comparing with http://localhost:$HGPORT/
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   505
  searching for changes
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   506
  no changes found
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   507
  [1]
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   508
  $ cd ..
df902fe3d79e treediscovery: always return all remote heads
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14410
diff changeset
   509
14831
0407b7613e99 treediscovery: rename stop() in tests to fix failures on AIX.
Jim Hague <jim.hague@acm.org>
parents: 14698
diff changeset
   510
  $ tstop
14199
e3dd3dcd6059 treediscovery: fix regression when run against older repos (issue2793)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
   511