tests/test-exchange-obsmarkers-case-A1.t
author Matt Harbison <matt_harbison@yahoo.com>
Sat, 27 Apr 2019 22:45:16 -0400
changeset 4625 a4fde4e3e763
parent 4181 ab3581bc0637
child 4202 f555039d1a08
child 4840 62b60fc1983d
permissions -rw-r--r--
templatekw: add `instabilities` alias for `troubles` Per https://www.mercurial-scm.org/wiki/CEDVocabulary
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)'`
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  $ hg log -G
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  @  f5bc6836db60 (draft): A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  o  a9bdc8b26820 (public): O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    61
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    62
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    63
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    64
  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
    65
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    66
  ===========
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
    67
  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
    68
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    69
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    70
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    71
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    72
             1 f5bc6836db60            0            2            2 50656e04a95e
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    73
             0 a9bdc8b26820            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    74
             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
    75
  $ cd ..
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
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
setup both variants
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    80
  $ 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
    81
  $ 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
    82
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    83
Variant a: push -r A
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    84
--------------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    86
  $ 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
    87
  ## 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
    88
  # testing echange of "A" (f5bc6836db60)
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    89
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    90
  # 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
    91
  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
    92
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    93
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
    94
  ## 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
    95
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    97
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    98
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    99
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   100
  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
   101
  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
   102
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  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
   105
  # 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
   106
  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
   107
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   108
  ## 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
   109
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  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
   115
  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
   116
  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
   117
  (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
   118
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   119
  # 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
   120
  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
   121
  # 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
   122
  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
   123
  # 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
   124
  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
   125
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   126
Variant b: push
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   127
---------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   129
  $ dotest A.1.1.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   130
  ## 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
   131
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   132
  # 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
   133
  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
   134
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   135
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   136
  ## pushing from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   137
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   139
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   140
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   141
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   142
  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
   143
  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
   144
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   145
  # 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
   146
  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
   147
  # 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
   148
  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
   149
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   150
  ## pulling from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   151
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   152
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  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
   157
  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
   158
  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
   159
  (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
   160
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
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
  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
   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
  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
   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
  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
   167
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   168
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
   169
====================================================
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   170
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
..       B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   173
..      |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   174
..     ⇠◔ A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   175
..      |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   176
..       O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   177
.. }}}
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
.. Marker exist from:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   180
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   181
..  * A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   182
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   183
.. Command run:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   184
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   185
..  * hg push -r B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   186
..  * hg push
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   187
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   188
.. Expected exchange:
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   189
..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   190
..  * chain from A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   191
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   192
Setup
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   193
-----
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   194
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   195
initial
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   196
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   197
  $ setuprepos A.1.2
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   198
  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
   199
  - pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   200
  - main
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   201
  - pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   202
  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
   203
  $ cd main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   204
  $ mkcommit A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   205
  $ mkcommit B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   206
  $ hg log -G
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   207
  @  f6fbb35d8ac9 (draft): B
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   208
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   209
  o  f5bc6836db60 (draft): A
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   210
  |
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   211
  o  a9bdc8b26820 (public): O
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   212
  
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   213
  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   214
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   215
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   216
  ================
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   217
  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
   218
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   219
  ===========
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   220
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   221
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   222
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 9cfa25b36856aa720419146abddd011cf87d368c
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   223
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   224
  ============
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   225
           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
   226
             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
   227
             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
   228
             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
   229
             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
   230
             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
   231
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   232
  $ cd ..
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   233
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   234
setup both variants
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   235
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   236
  $ 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
   237
  $ 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
   238
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   239
Variant a: push -r A
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   240
--------------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   241
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   242
  $ 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
   243
  ## 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
   244
  # testing echange of "B" (f6fbb35d8ac9)
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   245
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   246
  # 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
   247
  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
   248
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   249
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   250
  ## 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
   251
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   252
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   253
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   254
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   255
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   256
  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
   257
  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
   258
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   259
  # 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
   260
  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
   261
  # 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
   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: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   264
  ## 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
   265
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   266
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   267
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   268
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   269
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   270
  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
   271
  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
   272
  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
   273
  (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
   274
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   275
  # 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
   276
  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
   277
  # 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
   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: 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
   280
  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
   281
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   282
Variant b: push
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   283
---------------
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   284
831
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   285
  $ dotest A.1.2.b
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   286
  ## 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
   287
  ## initial state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   288
  # 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
   289
  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
   290
  # obstore: pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   291
  # obstore: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   292
  ## pushing from main to pushdest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   293
  pushing to pushdest
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   294
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   295
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   296
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   297
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   298
  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
   299
  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
   300
  ## post push state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   301
  # 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
   302
  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
   303
  # 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
   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: pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   306
  ## pulling from main into pulldest
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   307
  pulling from main
827
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   308
  searching for changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   309
  adding changesets
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   310
  adding manifests
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   311
  adding file changes
f62ff54c893b exchange: add test case for A.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   312
  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
   313
  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
   314
  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
   315
  (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
   316
  ## post pull state
a6af6919888d exchange: automate the testing process too
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 829
diff changeset
   317
  # 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
   318
  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
   319
  # 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
   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: 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
   322
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}