author | Boris Feld <boris.feld@octobus.net> |
Sun, 04 Jun 2017 21:43:17 +0200 | |
changeset 2584 | 325f7a2e87e2 |
parent 2580 | 51a1dd295fe0 |
child 2754 | 21f06d932231 |
permissions | -rw-r--r-- |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
1 |
============================================ |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
2 |
Testing obsolescence markers push: Cases C.4 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
3 |
============================================ |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
5 |
Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
6 |
all changesets that requested to be "in sync" after the push (even if they are |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
7 |
already on both side). |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
9 |
This test belongs to a series of tests checking such set is properly computed |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
10 |
and applied. This does not tests "obsmarkers" discovery capabilities. |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
12 |
Category C: advanced case |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
13 |
TestCase 4: multiple successors, one is pruned |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
14 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
15 |
C.4 multiple successors, one is pruned |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
16 |
====================================== |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
17 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
18 |
.. (A similarish situation can appends with split markers see the Z section) |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
.. {{{ |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
.. A |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. B ○⇢ø⇠⊗ C |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
.. \|/ |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
.. ● O |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
.. }}} |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
.. Marker exist from: |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
.. * `A ø⇠○ B` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
.. * `A ø⇠○ C` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. * C (prune) |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
.. Command run: |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
.. * hg push -r O |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
.. Expected exchange: |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
.. * `A ø⇠○ C` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
.. * C (prune) |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
.. Expected exclude: |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
.. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
.. * `A ø⇠○ B` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
46 |
Setup |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
47 |
----- |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
48 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
49 |
$ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
50 |
|
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
Implemented as the non-split version |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
|
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
$ setuprepos C.4 |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
creating test repo for test case C.4 |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
- pulldest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
- main |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
- pushdest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
cd into `main` and proceed with env setup |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
$ cd main |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
$ mkcommit A |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
$ hg update -q 0 |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
$ mkcommit B |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
created new head |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
$ hg update -q 0 |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
$ mkcommit C |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
created new head |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
$ hg prune -qd '0 0' . |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
$ hg log -G --hidden |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
x 7f7f229b13a6 (draft): C |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
| |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
| o 35b183996678 (draft): B |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
|/ |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
| x f5bc6836db60 (draft): A |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 |
|/ |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
@ a9bdc8b26820 (public): O |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
79 |
$ inspect_obsmarkers |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
80 |
obsstore content |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
81 |
================ |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
82 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
83 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
84 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
85 |
obshashtree |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
86 |
=========== |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
87 |
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 172c7e3f43e9982efc74a27d34bd7a54cc158b57 |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
88 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 c195f40b705423f406e537d1c64f6bc131a80214 |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
89 |
35b1839966785d5703a01607229eea932db42f87 76197cf2f9c1dcf5baa6cc3f4057980055353c03 |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
90 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed e0a3b65709a8a1938e6c6cfc49a45253849e31a2 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
91 |
obshashrange |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
92 |
============ |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
93 |
rev node index size depth obshash |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
94 |
2 35b183996678 0 2 2 8d1b3b767a40 |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
95 |
2 35b183996678 1 1 2 916e804c50de |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
96 |
0 a9bdc8b26820 0 1 1 172c7e3f43e9 |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
$ cd .. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
$ cd .. |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
|
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
Actual Test |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
101 |
----------- |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |
|
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
103 |
$ dotest C.4 O |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
104 |
## Running testcase C.4 |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 |
# testing echange of "O" (a9bdc8b26820) |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 |
## initial state |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
107 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
108 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
109 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
110 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 |
# obstore: pushdest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 |
# obstore: pulldest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 |
## pushing "O" from main to pushdest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 |
pushing to pushdest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
115 |
searching for changes |
1078
5717d023da63
obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1067
diff
changeset
|
116 |
no changes found |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
117 |
remote: 2 new obsolescence markers |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |
## post push state |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
120 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
121 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
122 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
905
b177fde040dd
exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
847
diff
changeset
|
123 |
# obstore: pushdest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
124 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
125 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
# obstore: pulldest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
## pulling "a9bdc8b26820" from main into pulldest |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
pulling from main |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
no changes found |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
130 |
2 new obsolescence markers |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 |
## post pull state |
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
133 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
134 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
135 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
847
d11446392c1d
exchange: add test case for C.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 |
# obstore: pushdest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
137 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
138 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |
905
b177fde040dd
exchange: use fixed order for obstore content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
847
diff
changeset
|
139 |
# obstore: pulldest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
140 |
7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob) |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
141 |
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (*) {'user': 'test'} (glob) |