author | Matt Harbison <matt_harbison@yahoo.com> |
Sat, 16 Dec 2017 11:32:10 -0500 | |
changeset 35450 | 991e4404e910 |
parent 31916 | 4a4fa665e1b4 |
permissions | -rw-r--r-- |
31916
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 |
============================================ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
Testing obsolescence markers push: Cases B.4 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
============================================ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
|
4a4fa665e1b4
obsolescence: add test case B-4 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 |
4a4fa665e1b4
obsolescence: add test case B-4 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 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 |
already on both side). |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
|
4a4fa665e1b4
obsolescence: add test case B-4 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 |
4a4fa665e1b4
obsolescence: add test case B-4 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. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 |
Category B: pruning case |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 |
TestCase 4: Pruned changeset on common part of the history |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 |
Variants: |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 |
# a: explicite push |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 |
# b: bare push |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
B.4 Pruned changeset on common part of history |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
============================================= |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
.. {{{ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
.. ⊗ C |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
.. | ● B |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
.. | | |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 |
.. | ● A |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
.. |/ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 |
.. ● O |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
.. }}} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
.. Marker exist from: |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
.. * C (prune) |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
.. Command run: |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
35 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
.. * hg push -r B |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 |
.. * hg push |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 |
.. Expected exchange: |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
.. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
.. * prune for C |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
Setup |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
----- |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 |
$ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 |
initial |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
49 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
50 |
$ setuprepos B.4 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 |
creating test repo for test case B.4 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 |
- pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
53 |
- main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 |
- pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 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 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
56 |
$ cd main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 |
$ mkcommit A |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 |
$ mkcommit B |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 |
$ hg phase --public . |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 |
$ hg push ../pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
61 |
pushing to ../pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
62 |
searching for changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
63 |
remote: adding changesets |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
64 |
remote: adding manifests |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 |
remote: adding file changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 |
remote: added 2 changesets with 2 changes to 2 files |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
67 |
$ hg push ../pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 |
pushing to ../pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 |
searching for changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 |
remote: adding changesets |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
71 |
remote: adding manifests |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
72 |
remote: adding file changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 |
remote: added 2 changesets with 2 changes to 2 files |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 |
$ hg update -q 0 |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 |
$ mkcommit C |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
76 |
created new head |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 |
$ hg prune -qd '0 0' . |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
78 |
$ hg log -G --hidden |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
79 |
x 7f7f229b13a6 (draft): C |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
80 |
| |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
81 |
| o f6fbb35d8ac9 (public): B |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
82 |
| | |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
83 |
| o f5bc6836db60 (public): A |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
84 |
|/ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 |
@ a9bdc8b26820 (public): O |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
87 |
$ inspect_obsmarkers |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 |
obsstore content |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
89 |
================ |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
90 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
91 |
$ cd .. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
92 |
$ cd .. |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
93 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
94 |
$ cp -R B.4 B.4.a |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
95 |
$ cp -R B.4 B.4.b |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
96 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
97 |
Actual Test (explicit push version) |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
98 |
----------------------------------- |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
99 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
100 |
$ dotest B.4.a O |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
101 |
## Running testcase B.4.a |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
102 |
# testing echange of "O" (a9bdc8b26820) |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
103 |
## initial state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
105 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 |
## pushing "O" from main to pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 |
pushing to pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 |
searching for changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 |
no changes found |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 |
remote: 1 new obsolescence markers |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
113 |
## post push state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
115 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 |
## pulling "a9bdc8b26820" from main into pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
120 |
pulling from main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 |
no changes found |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
122 |
1 new obsolescence markers |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 |
## post pull state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
124 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
125 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
126 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
127 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
128 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
129 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
130 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
131 |
Actual Test (bare push version) |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
132 |
----------------------------------- |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
133 |
|
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
134 |
$ dotest B.4.b |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
135 |
## Running testcase B.4.b |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
136 |
## initial state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
137 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
138 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
139 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
140 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
141 |
## pushing from main to pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
142 |
pushing to pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
143 |
searching for changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
144 |
no changes found |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
145 |
remote: 1 new obsolescence markers |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
146 |
## post push state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
147 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
148 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
149 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
150 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
151 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
152 |
## pulling from main into pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
153 |
pulling from main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
154 |
searching for changes |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 |
no changes found |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
156 |
1 new obsolescence markers |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
157 |
## post pull state |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
158 |
# obstore: main |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
160 |
# obstore: pushdest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
161 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
162 |
# obstore: pulldest |
4a4fa665e1b4
obsolescence: add test case B-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
163 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |