tests/test-exchange-C2.t
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
Fri, 04 Jul 2014 09:29:13 -0400
changeset 993 8a4a8fe50c26
parent 984 b286f77d680c
child 1037 bddee73b361e
permissions -rw-r--r--
evolve: do not use _ as an unused variable The _ variable is the i18n function from core Mercurial, so locally assigning to it can lead to name clashes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     1
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
Initial setup
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     5
  $ . $TESTDIR/_exc-util.sh
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     6
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     7
=== C.2 Pruned changeset on precursors ===
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     9
.. {{{
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    10
..   B 
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
..     |
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    12
..   A ø⇠◔ A'
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    13
..     |/
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    14
..     ● O
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    15
.. }}}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    16
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
.. Marker exist from:
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
..  * A' succeed to A
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
..  * B (prune)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
.. Command run:
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..  * hg push -r A'
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
..  * hg push
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
.. Expected exchange:
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..  * `A ø⇠o A'`
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
..  * B (prune)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
  $ setuprepos C.2
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
  creating test repo for test case C.2
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
  - pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
  - main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
  - pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
  cd into `main` and proceed with env setup
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  $ cd main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  $ mkcommit A0
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
  $ mkcommit B
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
  $ hg prune -qd '0 0' .
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
  $ hg update -q 0
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
  $ mkcommit A1
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
  created new head
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
  $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
  $ hg log -G --hidden
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  @  e5ea8f9c7314 (draft): A1
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
  |
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    49
  | x  06055a7959d4 (draft): B
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  | |
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  | x  28b51eb45704 (draft): A0
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  |/
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  o  a9bdc8b26820 (public): O
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ hg debugobsolete
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ cd ..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  $ cd ..
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  $ cp -r C.2 C.2.a
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  $ cp -r C.2 C.2.b
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    64
Actual Test (explicit push)
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    65
---------------------------
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ dotest C.2.a A1
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  ## Running testcase C.2.a
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  # testing echange of "A1" (e5ea8f9c7314)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  ## initial state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  # obstore: pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  ## pushing "A1" from main to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  pushing to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  added 1 changesets with 1 changes to 1 files
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
  OBSEXC: computing relevant nodes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  OBSEXC: computing markers relevant to 2 nodes
957
2cde59f3cb5d evolve: add a push pass using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 956
diff changeset
    85
  OBSEXC: pushing 2 markers (150 bytes)
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
  OBSEXC: DONE
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  ## post push state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    90
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  # obstore: pushdest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
    92
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
  ## pulling "e5ea8f9c7314" from main into pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  pulling from main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    99
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  added 1 changesets with 1 changes to 1 files
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  OBSEXC: pull obsolescence markers
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  OBSEXC: merging obsolescence markers (150 bytes)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  OBSEXC: 2 markers added
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  OBSEXC: DONE
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  (run 'hg update' to get a working copy)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  ## post pull state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
  # obstore: pushdest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
   112
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  # obstore: pulldest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
   115
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
Actual Test (bare push)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
-------------------------------------
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  $ dotest C.2.b
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  ## Running testcase C.2.b
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  ## initial state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   127
  # obstore: pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
  ## pushing from main to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
  pushing to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  added 1 changesets with 1 changes to 1 files
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  OBSEXC: computing relevant nodes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  OBSEXC: computing markers relevant to 2 nodes
957
2cde59f3cb5d evolve: add a push pass using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 956
diff changeset
   138
  OBSEXC: pushing 2 markers (150 bytes)
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  OBSEXC: DONE
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  ## post push state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  # obstore: pushdest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
   145
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   146
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   147
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   148
  ## pulling from main into pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  pulling from main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   151
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   152
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  added 1 changesets with 1 changes to 1 files
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  OBSEXC: pull obsolescence markers
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  OBSEXC: merging obsolescence markers (150 bytes)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  OBSEXC: 2 markers added
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   158
  OBSEXC: DONE
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   159
  (run 'hg update' to get a working copy)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  ## post pull state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   161
  # obstore: main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   162
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   163
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   164
  # obstore: pushdest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
   165
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   166
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   167
  # obstore: pulldest
905
b177fde040dd exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 845
diff changeset
   168
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   169
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}