tests/test-exchange-obsmarkers-case-A6.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 11 Mar 2019 23:57:12 -0700
changeset 4500 cfcb7eedc666
parent 2754 21f06d932231
child 2798 2280461343e5
child 4840 62b60fc1983d
permissions -rw-r--r--
evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case.
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)'`
2754
21f06d932231 test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
    67
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  $ hg log -G --hidden
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  @  e5ea8f9c7314 (draft): A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  |
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  | x  28b51eb45704 (draft): A0
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  |/
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  o  a9bdc8b26820 (public): O
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    75
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    76
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    77
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    78
  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
    79
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    80
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    81
  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
    82
  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
    83
  e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    84
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    85
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    86
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    87
             2 e5ea8f9c7314            0            2            2 3bc2ee626e11
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    88
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    89
             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
    90
  $ cd ..
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
2268
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.a
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.b
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
Actual Test (explicit push version)
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
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
  $ dotest A.6.a A1
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  ## Running testcase A.6.a
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  # testing echange of "A1" (e5ea8f9c7314)
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  # 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
   104
  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
   105
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  ## 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
   108
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   110
  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
   111
  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
   112
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  # 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
   115
  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
   116
  # 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
   117
  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
   118
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  ## 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
   120
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  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
   122
  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
   123
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  # 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
   126
  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
   127
  # 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
   128
  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
   129
  # 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
   130
  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
   131
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
Actual Test (bare push version)
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   133
-------------------------------
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  $ dotest A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  ## Running testcase A.6.b
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  ## initial state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  # 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
   139
  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
   140
  # obstore: pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  ## pushing from main to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  pushing to pushdest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  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
   146
  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
   147
  remote: obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   148
  ## post push state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  # 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
   150
  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
   151
  # 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
   152
  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
   153
  # obstore: pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  ## pulling from main into pulldest
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  pulling from main
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  searching for changes
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  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
   158
  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
   159
  obsoleted 1 changesets
835
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  ## post pull state
34a565a2058d exchange: add test case for A.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   161
  # 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
   162
  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
   163
  # 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
   164
  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
   165
  # 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
   166
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}