tests/test-exchange-obsmarkers-case-A6.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 07 Nov 2019 23:17:34 -0800
changeset 4949 eb9bcef7cc5f
parent 4871 a8ff17479fb8
child 4905 f3e39a354378
permissions -rw-r--r--
obslog: redefine default output as a template, unless -f was given This was easier than I expected to do without affecting any test output at all. `hg obslog -f` is pretty broken with templating. For example, it inserts a single "date" field, but it provides two values for it if the dates are different. That results in a traceback when running e.g. `hg obslog -f -Tfoo` with non-local obsmarkers with different dates. We need to figure out what we want to put in the template for the filtered case. I've just left it out for now.
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)'`
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    67
  1 new obsolescence markers
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
    68
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  $ hg log -G --hidden
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  @  e5ea8f9c7314 (draft): A1
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
  | x  28b51eb45704 (draft): A0
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  |/
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  o  a9bdc8b26820 (public): O
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    76
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    77
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    78
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    79
  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
    80
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    81
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    82
  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
    83
  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
    84
  e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    85
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    86
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    87
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    88
             2 e5ea8f9c7314            0            2            2 3bc2ee626e11
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    89
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    90
             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
    91
  $ cd ..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  $ cd ..
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    94
  $ 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
    95
  $ 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
    96
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
Actual Test (explicit push version)
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
-----------------------------------
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  $ dotest A.6.a A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  ## Running testcase A.6.a
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  # testing echange of "A1" (e5ea8f9c7314)
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  # 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
   105
  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
   106
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  ## 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
   109
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
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: 1065
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: 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
   113
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  # 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
   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: 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
   118
  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
   119
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  ## 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
   121
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  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
   123
  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
   124
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  # 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
   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: 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
   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
  # 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
   131
  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
   132
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
Actual Test (bare push version)
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   134
-------------------------------
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  $ dotest A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  ## Running testcase A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  # 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
   140
  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
   141
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  ## pushing from main to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   146
  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
   147
  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
   148
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  # 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
   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: 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
   153
  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
   154
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  ## pulling from main into pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   158
  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
   159
  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
   160
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   161
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   162
  # 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
   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: 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
   165
  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
   166
  # 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
   167
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}