tests/test-exchange-obsmarkers-case-D4.t
author Manuel Jacob <me@manueljacob.de>
Sat, 21 Mar 2020 20:36:41 +0100
changeset 5314 f12d2172a133
parent 4871 a8ff17479fb8
child 4905 f3e39a354378
permissions -rw-r--r--
evolve: consider all obsolete ancestors when finding new parent for orphan Both the old and the new logic have in common that the orphan changeset is moved to the tipmost successor of one or more ancestors of the orphan changeset. The previous logic considered only the first non-pruned ancestor of the orphan changeset. The new logic considers all obsolete ancestors of the orphan changeset. The logic in _possibledestination() had to be changed to be consistent with the new logic.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     1
============================================
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     2
Testing obsolescence markers push: Cases D.4
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     3
============================================
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     5
Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     6
all changesets that requested to be "in sync" after the push (even if they are
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     7
already on both side).
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
     9
This test belongs to a series of tests checking such set is properly computed
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    10
and applied. This does not tests "obsmarkers" discovery capabilities.
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    12
Category D: Partial Information Case
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    13
TestCase 4: Unknown changeset in between known changesets
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    14
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    15
D.4 Unknown changeset in between known one
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    16
==========================================
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
.. Mostly a clarification case
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
.. {{{
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    21
..   B ø⇠◌⇠○ B''
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    22
..     |   |
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    23
..   A ø⇠◌⇠◔ A'
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    24
..      \ /
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    25
..       ● O
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
.. }}}
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
.. Should be treated as A.3 case:
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
.. {{{
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    33
..   B ø⇠○ B''
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
..     | |
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    35
..   A ø⇠◔ A'
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
..     |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
..      O
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
.. }}}
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    41
Setup
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    42
-----
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    43
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    44
  $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
initial
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
2267
150fee60887a tests: fix directory names in exchange-D4 test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    48
  $ setuprepos D.4
150fee60887a tests: fix directory names in exchange-D4 test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    49
  creating test repo for test case D.4
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  - pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  - main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  - pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  cd into `main` and proceed with env setup
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  $ cd main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ mkcommit A0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  $ mkcommit B0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  $ hg update -q 0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ mkcommit A1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  created new head
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  $ mkcommit B1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    62
  1 new obsolescence markers
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2580
diff changeset
    63
  obsoleted 1 changesets
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3075
diff changeset
    64
  1 new orphan changesets
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    66
  1 new obsolescence markers
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    68
  1 new obsolescence markers
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2580
diff changeset
    69
  obsoleted 1 changesets
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    71
  1 new obsolescence markers
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  $ hg log -G --hidden
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  @  069b05c3876d (draft): B1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  o  e5ea8f9c7314 (draft): A1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  | x  6e72f0a95b5e (draft): B0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  | |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  | x  28b51eb45704 (draft): A0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  o  a9bdc8b26820 (public): O
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    83
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    84
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    85
  ================
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
    86
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
    87
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
    88
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
    89
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    90
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    91
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    92
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    93
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    94
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    95
  e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0aacc2f86e8fca29f2d5fd8d0790644620acd58a
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    96
  069b05c3876d56f62895e853a501ea58ea85f68d 40b98bc2b5b1152416ea8e9665ae1c6a3ce32ba0
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    97
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
    98
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    99
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   100
             4 069b05c3876d            0            3            3 a2b2331da650
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   101
             3 e5ea8f9c7314            0            2            2 0aacc2f86e8f
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   102
             4 069b05c3876d            2            1            3 901f118d4333
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   103
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   104
             3 e5ea8f9c7314            1            1            2 0aacc2f86e8f
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  $ cd ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  $ cd ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
   108
Actual Test
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2267
diff changeset
   109
-----------
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
2267
150fee60887a tests: fix directory names in exchange-D4 test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   111
  $ dotest D.4 A1
150fee60887a tests: fix directory names in exchange-D4 test
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   112
  ## Running testcase D.4
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  # testing echange of "A1" (e5ea8f9c7314)
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  ## initial state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  # obstore: main
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   116
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   117
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   118
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   119
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  # obstore: pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  # obstore: pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  ## pushing "A1" from main to pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  pushing to pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   125
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   126
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   127
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   128
  remote: added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   129
  remote: 2 new obsolescence markers
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
  ## post push state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
  # obstore: main
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   132
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   133
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   134
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   135
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  # obstore: pushdest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   137
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   138
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  # obstore: pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  ## pulling "e5ea8f9c7314" from main into pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  pulling from main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  searching for changes
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  adding changesets
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  adding manifests
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  adding file changes
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   146
  added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   147
  2 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   148
  new changesets e5ea8f9c7314 (1 drafts)
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  (run 'hg update' to get a working copy)
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  ## post pull state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   151
  # obstore: main
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   152
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   153
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   154
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   155
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  # obstore: pushdest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   157
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   158
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   159
  # obstore: pulldest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   160
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   161
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}