tests/test-exchange-obsmarkers-case-A6.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 14 Jul 2017 00:58:14 +0200
changeset 2734 39c3b2b5deb0
parent 2710 e22de367fc74
child 2754 21f06d932231
permissions -rw-r--r--
prev: rename 'p' to 'target' This makes the code clearer.
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 A.6
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     3
============================================
835
34a565a2058d exchange: add test case for A.6
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).
835
34a565a2058d exchange: add test case for A.6
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.
835
34a565a2058d exchange: add test case for A.6
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 A: simple cases
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    13
TestCase 6: new markers between changesets already known on both side
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    14
Variants:
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    15
# a: explicit push
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    16
# b: bare push
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    18
A.6  new markers between changesets already known on both side
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    19
==============================================================
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
.. {{{
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
..   A ◕⇠● B
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..     |/
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..      O
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
.. }}}
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
.. Marker exist from:
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..  * `A◕⇠● B`
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
..
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    31
.. Command runs:
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
..  * hg push -r B
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
..  * hg push
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
.. Expected exchange:
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
..  * `A◕⇠● B`
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    40
Setup
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    41
-----
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    42
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    43
  $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
initial
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  $ setuprepos A.6
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
  creating test repo for test case A.6
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    49
  - pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  - main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  - pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  cd into `main` and proceed with env setup
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  $ cd main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  $ mkcommit A0
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ hg update -q 0
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  $ mkcommit A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  created new head
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    59
make both changeset known in remote
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  $ hg push -qf ../pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  $ hg push -qf ../pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
create a marker after this
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
  $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ hg log -G --hidden
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  @  e5ea8f9c7314 (draft): A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  |
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  | x  28b51eb45704 (draft): A0
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  |/
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  o  a9bdc8b26820 (public): O
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    74
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    75
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    76
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    77
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 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
    78
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    79
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    80
  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
    81
  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
    82
  e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    83
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    84
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    85
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    86
             2 e5ea8f9c7314            0            2            2 3bc2ee626e11
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    87
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    88
             2 e5ea8f9c7314            1            1            2 3bc2ee626e11
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  $ cd ..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    90
  $ cd ..
34a565a2058d exchange: add test case for A.6
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
  $ cp -R A.6 A.6.a
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    93
  $ cp -R A.6 A.6.b
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
Actual Test (explicit push version)
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
-----------------------------------
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
  $ dotest A.6.a A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
  ## Running testcase A.6.a
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  # testing echange of "A1" (e5ea8f9c7314)
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   103
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  ## pushing "A1" from main to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   109
  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
   110
  remote: 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2268
diff changeset
   111
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   114
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   116
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  ## pulling "e5ea8f9c7314" from main into pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  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
   121
  1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2268
diff changeset
   122
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   125
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   127
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
  # obstore: pulldest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   129
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
Actual Test (bare push version)
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   132
-------------------------------
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  $ dotest A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  ## Running testcase A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   138
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  ## pushing from main to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  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
   145
  remote: 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2268
diff changeset
   146
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   147
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   148
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   149
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   151
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   152
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  ## pulling from main into pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  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
   157
  1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2268
diff changeset
   158
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   159
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   161
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   162
  # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   163
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   164
  # obstore: pulldest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   165
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}