tests/test-exchange-C2.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Fri, 30 Oct 2015 16:04:37 +0000
changeset 1515 9729fdcc1fab
parent 1093 a49f2e7a2755
child 2083 778afb036245
permissions -rw-r--r--
prune: have dirstate collaborate with transaction With 3.6, dirstate update can work with transaction to ensure proper rollback. We do it if the mercurial version permit it.
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
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    56
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    57
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
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
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    72
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    73
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
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
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    79
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    80
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    81
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    82
  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
    83
  remote: 2 new obsolescence markers
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  ## post push state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    86
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    87
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
    89
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    90
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  ## 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
    93
  pulling from main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
  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
    99
  2 new obsolescence markers
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  (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
   101
  ## post pull state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   103
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   104
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   106
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
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
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  # obstore: pulldest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   109
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   110
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
Actual Test (bare push)
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
-------------------------------------
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  $ dotest C.2.b
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  ## Running testcase C.2.b
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  ## initial state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   119
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
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
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  # obstore: pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  ## pushing from main to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  pushing to pushdest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   126
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   127
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   128
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   129
  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
   130
  remote: 2 new obsolescence markers
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
  ## post push state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   133
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
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
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   136
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   137
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  # obstore: pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  ## pulling from main into pulldest
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  pulling from main
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  searching for changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  adding changesets
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  adding manifests
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
  adding file changes
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
  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
   146
  2 new obsolescence markers
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   147
  (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
   148
  ## post pull state
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  # obstore: main
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   150
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   151
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   152
  # obstore: pushdest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   153
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   154
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
845
7957eecd5592 exchange: add test case for C.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  # obstore: pulldest
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   156
  06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   157
  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}