tests/test-exchange-obsmarkers-case-B5.t
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 14 Jun 2018 01:39:11 +0530
changeset 3849 a17d4934c5ce
parent 3566 e6bea259c227
child 3590 d5adce52cef4
child 4093 ef22eef37ecc
permissions -rw-r--r--
tests: fix a test case to not create conflicts This is the test case where we are testing about divergence resolution of stack of patches. If the stack is as follows: C1 C2 | | B1 B2 | | A1 A2 \/ base And A1-A2, B1-B2 and C1-C2 are content-divergent, and merging A1-A2 results in conflicts. Now if you resolve conflicts and continue resoling B1-B2, the conflicts of A1-A2 will still be there. We need somehow to understand the work we has done and not create conflicts again. To test the evolution functionality for now, we make sure conflicts does not occur.
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: 2230
diff changeset
     1
============================================
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     2
Testing obsolescence markers push: Cases B.5
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     3
============================================
841
07891b3308a2 exchange: add test case for B.5
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: 2230
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: 2230
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: 2230
diff changeset
     7
already on both side).
841
07891b3308a2 exchange: add test case for B.5
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: 2230
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: 2230
diff changeset
    10
and applied. This does not tests "obsmarkers" discovery capabilities.
841
07891b3308a2 exchange: add test case for B.5
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: 2230
diff changeset
    12
Category B: pruning case
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    13
TestCase 5: Push of a children of changeset which successors is pruned
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    14
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    15
B.5 Push of a children of changeset which successors is pruned
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    16
==============================================================
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
.. This case Mirror A.4, with pruned changeset successors.
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
..
07891b3308a2 exchange: add test case for B.5
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: 2230
diff changeset
    21
..   C 
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
..     |
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    23
..   B⇠ø⇠⊗ B'
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    24
..     | |
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    25
..   A ø⇠○ A'
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..     |/
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    27
..     
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
.. }}}
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
.. Marker exist from:
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    32
..  * `A ø⇠○ A'`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    33
..  * `B ø⇠○ B'`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    34
..  * chain from B
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    35
..  * `B' is pruned`
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
..
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
.. Command run:
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    39
..  * hg push -r C
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
..
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
.. Expected exchange:
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    43
..  * chain from B
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    44
..
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    45
.. Expected exclude:
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    47
..  * `A ø⇠○ A'`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    48
..  * `B ø⇠○ B'`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    49
..  * `B' prune`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    50
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    51
Setup
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    52
-----
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    53
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    54
  $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    55
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    56
initial
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ setuprepos B.5
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  creating test repo for test case B.5
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  - pulldest
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  - main
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  - pushdest
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
  cd into `main` and proceed with env setup
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
  $ cd main
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  $ mkcommit A0
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    66
  $ mkcommit B0
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    67
  $ mkcommit C
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  $ hg up --quiet 0
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  $ mkcommit A1
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  created new head
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    71
  $ mkcommit B1
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2580
diff changeset
    73
  obsoleted 1 changesets
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
    74
  2 new orphan changesets
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    75
  $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    76
  $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2580
diff changeset
    77
  obsoleted 1 changesets
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    78
  $ hg prune -qd '0 0' 'desc(B1)' 
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  $ hg log -G --hidden
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    80
  x  069b05c3876d (draft): B1
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    81
  |
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    82
  @  e5ea8f9c7314 (draft): A1
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
    84
  | *  1d0f3cd25300 (draft): C
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    85
  | |
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    86
  | x  6e72f0a95b5e (draft): B0
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  | |
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  | x  28b51eb45704 (draft): A0
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  |/
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    90
  o  a9bdc8b26820 (public): O
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    92
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    93
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    94
  ================
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
    95
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 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
    96
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 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
    97
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
    98
  069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    99
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   100
  ===========
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   101
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   102
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   103
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   104
  1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   105
  e5ea8f9c73143125d36658e90ef70c6d2027a5b7 eb83c031f3cbab180666ee92f54f0832b9f46eaa
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   106
  069b05c3876d56f62895e853a501ea58ea85f68d 87d03503620a7443b999bc8b8c00346f7afe7168
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   107
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   108
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   109
           rev         node        index         size        depth      obshash
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   110
             3 1d0f3cd25300            0            4            4 000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   111
             3 1d0f3cd25300            2            2            4 000000000000
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   112
             1 28b51eb45704            0            2            2 000000000000
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   113
             4 e5ea8f9c7314            0            2            2 eb83c031f3cb
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   114
             3 1d0f3cd25300            3            1            4 000000000000
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   115
             1 28b51eb45704            1            1            2 000000000000
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   116
             2 6e72f0a95b5e            2            1            3 13bd00d88332
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   117
             0 a9bdc8b26820            0            1            1 000000000000
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   118
             4 e5ea8f9c7314            1            1            2 eb83c031f3cb
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  $ cd ..
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  $ cd ..
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   122
Actual Test (explicit push version)
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   123
-----------------------------------
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   125
  $ dotest B.5 C -f
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   126
  ## Running testcase B.5
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   127
  # testing echange of "C" (1d0f3cd25300)
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
  ## initial state
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
  # obstore: main
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   130
  069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   131
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 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
   132
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  # obstore: pushdest
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  # obstore: pulldest
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   136
  ## pushing "C" from main to pushdest
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  pushing to pushdest
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   139
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   140
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   141
  remote: adding file changes
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   142
  remote: added 3 changesets with 3 changes to 3 files
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   143
  remote: 1 new obsolescence markers
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  ## post push state
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  # obstore: main
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   146
  069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   147
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 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
   148
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
   149
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 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: 2230
diff changeset
   150
  # obstore: pushdest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   151
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   152
  # obstore: pulldest
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   153
  ## pulling "1d0f3cd25300" from main into pulldest
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  pulling from main
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  searching for changes
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  adding changesets
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  adding manifests
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   158
  adding file changes
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   159
  added 3 changesets with 3 changes to 3 files
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   160
  1 new obsolescence markers
3075
8feb2cae7eae test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2754
diff changeset
   161
  new changesets 28b51eb45704:1d0f3cd25300
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   162
  (run 'hg update' to get a working copy)
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   163
  ## post pull state
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   164
  # obstore: main
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   165
  069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   166
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 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
   167
  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
   168
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   169
  # obstore: pushdest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   170
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
841
07891b3308a2 exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   171
  # obstore: pulldest
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3431
diff changeset
   172
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}