tests/test-exchange-obsmarkers-case-A1.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Mon, 04 Nov 2019 00:18:55 +0530
changeset 5083 e50f4fc6cc6d
parent 4871 a8ff17479fb8
child 4905 f3e39a354378
permissions -rw-r--r--
evolve: remove a check which is already done by rewriteutil.precheck() We have tests to check if fold is being performed on public cset. There is no changes in test files because testing that never touched the part this patch removes, and already caught in rewriteutil.precheck()
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.1
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     3
============================================
827
f62ff54c893b exchange: add test case for A.1
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).
827
f62ff54c893b exchange: add test case for A.1
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.
827
f62ff54c893b exchange: add test case for A.1
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 1: pushing a single head
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    14
Subcases:
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    15
# A.1.1 pushing a single head (2 variants)
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    16
# A.1.2 pushing multiple changesets into a single head (2 variants)
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    17
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    18
Case: A.1.1 pushing a single head
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    19
=================================
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
.. {{{
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
..     ⇠◔ A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..      |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..       O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
.. }}}
f62ff54c893b exchange: add test case for A.1
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
.. Marker exists from:
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..  * A
f62ff54c893b exchange: add test case for A.1
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
.. Commands run:
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
..  * hg push -r A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
..  * hg push
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
.. Expected exchange:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
..  * chain from A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
Setup
2268
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
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
initial
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    47
  $ setuprepos A.1.1
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    48
  creating test repo for test case A.1.1
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    49
  - pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    50
  - main
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    51
  - pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    52
  cd into `main` and proceed with env setup
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    53
  $ cd main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  $ mkcommit A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    56
  1 new obsolescence markers
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  $ hg log -G
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  @  f5bc6836db60 (draft): A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  o  a9bdc8b26820 (public): O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    62
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    63
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    64
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    65
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 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
    66
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    67
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    68
  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
    69
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    70
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    71
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    72
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    73
             1 f5bc6836db60            0            2            2 50656e04a95e
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    74
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    75
             1 f5bc6836db60            1            1            2 50656e04a95e
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
setup both variants
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    81
  $ cp -R A.1.1 A.1.1.a
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    82
  $ cp -R A.1.1 A.1.1.b
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    84
Variant a: push -r A
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    85
--------------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    87
  $ dotest A.1.1.a A
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    88
  ## Running testcase A.1.1.a
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    89
  # testing echange of "A" (f5bc6836db60)
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    90
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    91
  # 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
    92
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    93
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    94
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    95
  ## pushing "A" from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    96
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    98
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    99
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   100
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   101
  remote: added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   102
  remote: 1 new obsolescence markers
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   103
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   106
  # 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
   107
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   108
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   109
  ## pulling "f5bc6836db60" from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   110
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   116
  1 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   117
  new changesets f5bc6836db60 (1 drafts)
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  (run 'hg update' to get a working copy)
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   119
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   120
  # 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
   121
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   122
  # 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
   123
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   124
  # 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
   125
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   127
Variant b: push
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   128
---------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   130
  $ dotest A.1.1.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   131
  ## Running testcase A.1.1.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   132
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   133
  # 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
   134
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   135
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   136
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   137
  ## pushing from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   138
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   140
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   141
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   142
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   143
  remote: added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   144
  remote: 1 new obsolescence markers
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   145
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   146
  # 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
   147
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   148
  # 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
   149
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   150
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   151
  ## pulling from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   152
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   158
  1 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   159
  new changesets f5bc6836db60 (1 drafts)
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  (run 'hg update' to get a working copy)
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   161
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   168
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   169
A.1.2 pushing multiple changesets into a single head
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   170
====================================================
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   171
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   172
.. {{{
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   173
..       B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   174
..      |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   175
..     ⇠◔ A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   176
..      |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   177
..       O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   178
.. }}}
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   179
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   180
.. Marker exist from:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   181
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   182
..  * A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   183
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   184
.. Command run:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   185
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   186
..  * hg push -r B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   187
..  * hg push
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   188
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   189
.. Expected exchange:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   190
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   191
..  * chain from A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   192
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   193
Setup
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   194
-----
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   195
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   196
initial
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   197
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   198
  $ setuprepos A.1.2
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   199
  creating test repo for test case A.1.2
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   200
  - pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   201
  - main
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   202
  - pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   203
  cd into `main` and proceed with env setup
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   204
  $ cd main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   205
  $ mkcommit A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   206
  $ mkcommit B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   207
  $ hg log -G
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   208
  @  f6fbb35d8ac9 (draft): B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   209
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   210
  o  f5bc6836db60 (draft): A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   211
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   212
  o  a9bdc8b26820 (public): O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   213
  
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   214
  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
4871
a8ff17479fb8 branching: preserve test change on stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
   215
  1 new obsolescence markers
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   216
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   217
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   218
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   219
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 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
   220
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   221
  ===========
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   222
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   223
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   224
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 9cfa25b36856aa720419146abddd011cf87d368c
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   225
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   226
  ============
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   227
           rev         node        index         size        depth      obshash
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   228
             2 f6fbb35d8ac9            0            3            3 000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   229
             1 f5bc6836db60            0            2            2 50656e04a95e
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   230
             0 a9bdc8b26820            0            1            1 000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   231
             1 f5bc6836db60            1            1            2 50656e04a95e
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   232
             2 f6fbb35d8ac9            2            1            3 000000000000
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   233
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   234
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   235
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   236
setup both variants
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   237
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   238
  $ cp -R A.1.2 A.1.2.a
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   239
  $ cp -R A.1.2 A.1.2.b
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   240
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   241
Variant a: push -r A
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   242
--------------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   243
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   244
  $ dotest A.1.2.a B
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   245
  ## Running testcase A.1.2.a
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   246
  # testing echange of "B" (f6fbb35d8ac9)
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   247
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   248
  # 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
   249
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   250
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   251
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   252
  ## pushing "B" from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   253
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   254
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   255
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   256
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   257
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   258
  remote: added 2 changesets with 2 changes to 2 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   259
  remote: 1 new obsolescence markers
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   260
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   261
  # 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
   262
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   263
  # 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
   264
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   265
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   266
  ## pulling "f6fbb35d8ac9" from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   267
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   268
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   269
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   270
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   271
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   272
  added 2 changesets with 2 changes to 2 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   273
  1 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   274
  new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts)
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   275
  (run 'hg update' to get a working copy)
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   276
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   277
  # 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
   278
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   279
  # 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
   280
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   281
  # 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
   282
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   283
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   284
Variant b: push
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   285
---------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   286
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   287
  $ dotest A.1.2.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   288
  ## Running testcase A.1.2.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   289
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   290
  # 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
   291
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   292
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   293
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   294
  ## pushing from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   295
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   296
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   297
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   298
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   299
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   300
  remote: added 2 changesets with 2 changes to 2 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   301
  remote: 1 new obsolescence markers
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   302
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   303
  # 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
   304
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   305
  # 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
   306
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   307
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   308
  ## pulling from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   309
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   310
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   311
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   312
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   313
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   314
  added 2 changesets with 2 changes to 2 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   315
  1 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   316
  new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts)
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   317
  (run 'hg update' to get a working copy)
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   318
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   319
  # 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
   320
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   321
  # 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
   322
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   323
  # 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
   324
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}