tests/test-exchange-C1.t
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 31 Jan 2017 12:32:45 -0800
branchstable
changeset 1786 b674277ea4ef
parent 1093 a49f2e7a2755
child 2083 778afb036245
permissions -rw-r--r--
uncommit: don't lose copy information of remaining files (issue5403) As reported in the issue, "hg uncommit" would lose copy information of the files that remained in the commit. The problem was simply that the a dict of copies was iterated as "src, dst in copies.items()" where it should have been "dst, src ...".
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
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
    72
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    73
  remote: 2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    76
  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
    77
  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
    78
  # obstore: pushdest
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: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  ## 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
    83
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    85
  2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    88
  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
    89
  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
    90
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    91
  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
    92
  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
    93
  # obstore: pulldest
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
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
Actual Test (bare push)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
-------------------------------------
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  $ dotest C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  ## Running testcase C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  ## initial state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   104
  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
   105
  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
   106
  # obstore: pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  ## pushing from main to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  pushing to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   111
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   112
  remote: 2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   115
  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
   116
  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
   117
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   118
  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
   119
  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
   120
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  ## pulling from main into pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  searching for changes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   125
  2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   127
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   128
  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
   129
  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
   130
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   131
  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
   132
  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
   133
  # obstore: pulldest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   134
  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
   135
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}