tests/test-exchange-C1.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Wed, 20 Aug 2014 20:49:48 -0700
changeset 1067 5d063fed9e3d
parent 1065 f355bbc124fc
child 1078 5717d023da63
permissions -rw-r--r--
evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     1
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
Initial setup
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
  $ . $TESTDIR/_exc-util.sh
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     5
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     6
=== C.1 Multiple pruned changeset atop each other ===
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     7
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
.. {{{
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     9
..    B
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    10
..   |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
..    A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    12
..   |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    13
..    O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    14
.. }}}
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    15
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    16
.. Marker exist from:
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
..  * A (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
..  * B (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
.. Command run:
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..  * hg push -r O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..  * hg push
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
.. Expected exchange:
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
.. 
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
..  * A (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..  * B (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
  $ setuprepos C.1
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
  creating test repo for test case C.1
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
  - pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
  - main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
  - pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
  cd into `main` and proceed with env setup
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
  $ cd main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  $ mkcommit A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  $ mkcommit B
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
  $ hg prune -qd '0 0' .^::.
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
  $ hg log -G --hidden
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
  x  f6fbb35d8ac9 (draft): B
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
  |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
  x  f5bc6836db60 (draft): A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
  |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
  @  a9bdc8b26820 (public): O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
  $ hg debugobsolete
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    49
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    50
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  $ cd ..
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  $ cd ..
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  $ cp -r C.1 C.1.a
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ cp -r C.1 C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    57
Actual Test (explicit push)
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    58
---------------------------
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  $ dotest C.1.a O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  ## Running testcase C.1.a
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  # testing echange of "O" (a9bdc8b26820)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
  ## initial state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    65
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    66
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  # obstore: pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  ## pushing "O" from main to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  pushing to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  searching for changes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  no changes found
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  OBSEXC: computing relevant nodes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  OBSEXC: computing markers relevant to 1 nodes
1037
bddee73b361e evolve: add "absolescence" in front of markers in the message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 984
diff changeset
    75
  OBSEXC: pushing 2 obsolescence markers (177 bytes)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  OBSEXC: DONE
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    79
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    80
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    82
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    83
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  ## pulling "a9bdc8b26820" from main into pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  no changes found
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  OBSEXC: pull obsolescence markers
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  OBSEXC: merging obsolescence markers (177 bytes)
1040
640f3280559e evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1037
diff changeset
    90
  OBSEXC: 2 obsolescence markers added
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  OBSEXC: DONE
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    94
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    95
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    97
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    98
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
  # obstore: pulldest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   100
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   101
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
Actual Test (bare push)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
-------------------------------------
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  $ dotest C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  ## Running testcase C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  ## initial state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   110
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   111
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
  # obstore: pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  ## pushing from main to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  pushing to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  searching for changes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  no changes found
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  OBSEXC: computing relevant nodes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  OBSEXC: computing markers relevant to 1 nodes
1037
bddee73b361e evolve: add "absolescence" in front of markers in the message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 984
diff changeset
   120
  OBSEXC: pushing 2 obsolescence markers (177 bytes)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  OBSEXC: DONE
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   124
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   125
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   127
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   128
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
  ## pulling from main into pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
  searching for changes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
  no changes found
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  OBSEXC: pull obsolescence markers
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  OBSEXC: merging obsolescence markers (177 bytes)
1040
640f3280559e evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1037
diff changeset
   136
  OBSEXC: 2 obsolescence markers added
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  OBSEXC: DONE
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   140
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   141
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   143
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   144
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  # obstore: pulldest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   146
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   147
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}