author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 20 Dec 2017 17:56:38 +0100 | |
changeset 3329 | c056f125e17d |
parent 3075 | 8feb2cae7eae |
child 3100 | ccfcacc5ee7c |
child 3359 | ae6fddf39933 |
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 B.5 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
3 |
============================================ |
841
07891b3308a2
exchange: add test case for B.5
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). |
841
07891b3308a2
exchange: add test case for B.5
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. |
841
07891b3308a2
exchange: add test case for B.5
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 B: pruning case |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
13 |
TestCase 5: Push of a children of changeset which successors is pruned |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
15 |
B.5 Push of a children of changeset which successors is pruned |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
16 |
============================================================== |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
.. This case Mirror A.4, with pruned changeset successors. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
.. {{{ |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
21 |
.. C ◔ |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. | |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
23 |
.. B⇠ø⇠⊗ B' |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
24 |
.. | | |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
25 |
.. A ø⇠○ A' |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. |/ |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
27 |
.. ● |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
.. }}} |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
.. Marker exist from: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
32 |
.. * `A ø⇠○ A'` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
33 |
.. * `B ø⇠○ B'` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
34 |
.. * chain from B |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
35 |
.. * `B' is pruned` |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
.. Command run: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
39 |
.. * hg push -r C |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
.. Expected exchange: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
43 |
.. * chain from B |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
44 |
.. |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
45 |
.. Expected exclude: |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
47 |
.. * `A ø⇠○ A'` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
48 |
.. * `B ø⇠○ B'` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
49 |
.. * `B' prune` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
50 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
51 |
Setup |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
52 |
----- |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
53 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
54 |
$ . $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
|
55 |
|
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
56 |
initial |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
$ setuprepos B.5 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
creating test repo for test case B.5 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
- pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
- main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
- pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
cd into `main` and proceed with env setup |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
$ cd main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
$ mkcommit A0 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
66 |
$ mkcommit B0 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
67 |
$ mkcommit C |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
$ hg up --quiet 0 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
$ mkcommit A1 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
created new head |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
71 |
$ mkcommit B1 |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2580
diff
changeset
|
73 |
obsoleted 1 changesets |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
74 |
$ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
75 |
$ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2580
diff
changeset
|
76 |
obsoleted 1 changesets |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
77 |
$ hg prune -qd '0 0' 'desc(B1)' |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
$ hg log -G --hidden |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
79 |
x 069b05c3876d (draft): B1 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
80 |
| |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
81 |
@ e5ea8f9c7314 (draft): A1 |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
| |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
83 |
| o 1d0f3cd25300 (draft): C |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
84 |
| | |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
85 |
| x 6e72f0a95b5e (draft): B0 |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 |
| | |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 |
| x 28b51eb45704 (draft): A0 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 |
|/ |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
89 |
o a9bdc8b26820 (public): O |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
90 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
91 |
$ inspect_obsmarkers |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
92 |
obsstore content |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
93 |
================ |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
94 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 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
|
95 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 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
|
96 |
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
|
97 |
069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'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
|
98 |
obshashtree |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
99 |
=========== |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
100 |
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
101 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
102 |
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
103 |
1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8 |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
104 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 13bd4798a9a787c0b54db36e03ec580012600b50 |
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
105 |
069b05c3876d56f62895e853a501ea58ea85f68d 35916a1d760564c67d3a68921fd5908f28b486c0 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
106 |
obshashrange |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
107 |
============ |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
108 |
rev node index size depth obshash |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
109 |
3 1d0f3cd25300 0 4 4 000000000000 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
110 |
3 1d0f3cd25300 2 2 4 000000000000 |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
111 |
1 28b51eb45704 0 2 2 000000000000 |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
112 |
4 e5ea8f9c7314 0 2 2 13bd4798a9a7 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
113 |
3 1d0f3cd25300 3 1 4 000000000000 |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
114 |
1 28b51eb45704 1 1 2 000000000000 |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
115 |
2 6e72f0a95b5e 2 1 3 13bd00d88332 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
116 |
0 a9bdc8b26820 0 1 1 000000000000 |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
117 |
4 e5ea8f9c7314 1 1 2 13bd4798a9a7 |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |
$ cd .. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 |
$ cd .. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 |
|
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
121 |
Actual Test (explicit push version) |
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
122 |
----------------------------------- |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
124 |
$ dotest B.5 C -f |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
125 |
## Running testcase B.5 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
126 |
# testing echange of "C" (1d0f3cd25300) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
## initial state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
129 |
069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'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
|
130 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 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
|
131 |
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
|
132 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
133 |
# obstore: pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
134 |
# obstore: pulldest |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
135 |
## pushing "C" from main to pushdest |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 |
pushing to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
137 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
138 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
139 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
140 |
remote: adding file changes |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
141 |
remote: added 3 changesets with 3 changes to 3 files |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
142 |
remote: 1 new obsolescence markers |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
143 |
## post push state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
144 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
145 |
069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'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
|
146 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 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
|
147 |
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
|
148 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'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
|
149 |
# obstore: pushdest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
150 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
151 |
# obstore: pulldest |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
152 |
## pulling "1d0f3cd25300" from main into pulldest |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
153 |
pulling from main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
154 |
searching for changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
155 |
adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
156 |
adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
157 |
adding file changes |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
158 |
added 3 changesets with 3 changes to 3 files |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
159 |
1 new obsolescence markers |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2754
diff
changeset
|
160 |
new changesets 28b51eb45704:1d0f3cd25300 |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
161 |
(run 'hg update' to get a working copy) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
162 |
## post pull state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
163 |
# obstore: main |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
164 |
069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (*) {'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
|
165 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 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
|
166 |
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 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
|
167 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
168 |
# obstore: pushdest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
169 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
170 |
# obstore: pulldest |
2580
51a1dd295fe0
effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents:
2525
diff
changeset
|
171 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (*) {'user': 'test'} (glob) |