tests/test-exchange-obsmarkers-case-A2.t
author Yuya Nishihara <yuya@tcha.org>
Sat, 04 Nov 2017 19:21:39 +0900
branchstable
changeset 35025 5c6b96b832c2
parent 34661 eb586ed5d8ce
child 39480 89630d0b3e23
permissions -rw-r--r--
subrepo: extract preprocess of repo.commit() to free function No code change other than extracting a function. Maybe we should stop mutating the status argument, but that's out of the scope of stable changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
31907
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
============================================
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     2
Testing obsolescence markers push: Cases A.2
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     3
============================================
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     4
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     5
Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     6
all changesets that requested to be "in sync" after the push (even if they are
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     7
already on both side).
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     8
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     9
This test belongs to a series of tests checking such set is properly computed
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    10
and applied. This does not tests "obsmarkers" discovery capabilities.
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    11
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    12
Category A: simple cases
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    13
TestCase 2: Two heads, only one of them pushed
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    14
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    15
A.2 Two heads, only on of then pushed
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    16
=====================================
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    17
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    18
.. {{{
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    19
..     ⇠○ B
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    20
..   ⇠◔ | A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    21
..    |/
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    22
..    ● O
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    23
.. }}}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    24
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    25
.. Markers exist from:
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    26
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    27
..  * A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    28
..  * B
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    29
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    30
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    31
.. Command runs:
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    32
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    33
..  * hg push -r A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    34
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    35
.. Expected exchange:
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    36
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    37
..  * chain from A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    38
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    39
.. Expected Exclude:
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    40
..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    41
..  * chain from B
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    42
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    43
Setup
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    44
-----
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    45
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    46
  $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    47
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    48
initial
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    49
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    50
  $ setuprepos A.2
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    51
  creating test repo for test case A.2
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    52
  - pulldest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    53
  - main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    54
  - pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    55
  cd into `main` and proceed with env setup
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    56
  $ cd main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    57
  $ mkcommit A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    58
  $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    59
  $ hg up '.~1'
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    60
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    61
  $ mkcommit B
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    62
  created new head
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    63
  $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    64
  $ hg log -G
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    65
  @  35b183996678 (draft): B
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    66
  |
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    67
  | o  f5bc6836db60 (draft): A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    68
  |/
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    69
  o  a9bdc8b26820 (public): O
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    70
  
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    71
  $ inspect_obsmarkers
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    72
  obsstore content
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    73
  ================
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    74
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    75
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    76
  $ cd ..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    77
  $ cd ..
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    78
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    79
Actual Test
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    80
-----------
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    81
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    82
  $ dotest A.2 A
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    83
  ## Running testcase A.2
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    84
  # testing echange of "A" (f5bc6836db60)
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    85
  ## initial state
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    86
  # obstore: main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    87
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    88
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    89
  # obstore: pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    90
  # obstore: pulldest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    91
  ## pushing "A" from main to pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    92
  pushing to pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    93
  searching for changes
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    94
  remote: adding changesets
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    95
  remote: adding manifests
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    96
  remote: adding file changes
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    97
  remote: added 1 changesets with 1 changes to 1 files
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    98
  remote: 1 new obsolescence markers
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    99
  ## post push state
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   100
  # obstore: main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   101
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   102
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   103
  # obstore: pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   104
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   105
  # obstore: pulldest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   106
  ## pulling "f5bc6836db60" from main into pulldest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   107
  pulling from main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   108
  searching for changes
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   109
  adding changesets
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   110
  adding manifests
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   111
  adding file changes
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   112
  added 1 changesets with 1 changes to 1 files
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   113
  1 new obsolescence markers
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 31907
diff changeset
   114
  new changesets f5bc6836db60
31907
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   115
  (run 'hg update' to get a working copy)
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   116
  ## post pull state
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   117
  # obstore: main
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   118
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   119
  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   120
  # obstore: pushdest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   121
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   122
  # obstore: pulldest
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   123
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   124
fb8c3bc27e87 obsolescence: add test case A-2 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   125
  $ cd ..