author | Sushil khanchi <sushilkhanchi97@gmail.com> |
Sat, 02 Mar 2019 02:34:29 +0530 | |
changeset 4418 | 0ec30a7d9e12 |
parent 4181 | ab3581bc0637 |
child 4202 | f555039d1a08 |
child 4840 | 62b60fc1983d |
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 A.4 |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
3 |
============================================ |
833
cf803a36e3fb
exchange: add test case for A.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). |
833
cf803a36e3fb
exchange: add test case for A.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. |
833
cf803a36e3fb
exchange: add test case for A.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 A: simple cases |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
13 |
Testcase 4: Push in the middle of the obsolescence chain |
833
cf803a36e3fb
exchange: add test case for A.4
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 |
A.4 Push in the middle of the obsolescence chain |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
16 |
================================================ |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
|
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
.. (Where we show that we should not push the marker without the successors) |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
.. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
.. {{{ |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
.. B ◔ |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. | |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
.. A⇠ø⇠○ A' |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
.. |/ |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
.. ● O |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. }}} |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
28 |
.. Markers exist from: |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
30 |
.. * `A ø⇠○ A'` |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. * chain from A |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
.. |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
33 |
.. Command runs: |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
.. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
.. * hg push -r B |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
.. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
.. Expected exchange: |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
.. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
.. * Chain from A |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
.. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
.. Expected Exclude: |
cf803a36e3fb
exchange: add test case for A.4
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 |
.. * `Ai ø⇠○ A'` |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
45 |
Setup |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
46 |
----- |
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 |
$ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
|
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
initial |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
|
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
$ setuprepos A.4 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
creating test repo for test case A.4 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
- pulldest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
- main |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
- pushdest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
cd into `main` and proceed with env setup |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
$ cd main |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
$ mkcommit A0 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
$ mkcommit B |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
$ hg update 0 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
$ mkcommit A1 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
created new head |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
2754
21f06d932231
test: update test output to match b11e8c67fb0f
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2268
diff
changeset
|
67 |
obsoleted 1 changesets |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
68 |
1 new orphan changesets |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
$ hg log -G --hidden |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
@ e5ea8f9c7314 (draft): A1 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
| |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
72 |
| * 06055a7959d4 (draft): B |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
| | |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
| x 28b51eb45704 (draft): A0 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
|/ |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 |
o a9bdc8b26820 (public): O |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
78 |
$ inspect_obsmarkers |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
79 |
obsstore content |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
80 |
================ |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
81 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
82 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
83 |
obshashtree |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
84 |
=========== |
2083
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1093
diff
changeset
|
85 |
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1093
diff
changeset
|
86 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5d69322fad9eb1ba8f8f2c2312346ed347fdde76 |
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1093
diff
changeset
|
87 |
06055a7959d4128e6e3bccfd01482e83a2db8a3a fd3e5712c9c2d216547d7a1b87ac815ee1fb7542 |
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1093
diff
changeset
|
88 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 cf518031fa753e9b049d727e6b0e19f645bab38f |
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
89 |
obshashrange |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
90 |
============ |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
91 |
rev node index size depth obshash |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
92 |
2 06055a7959d4 0 3 3 000000000000 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
93 |
1 28b51eb45704 0 2 2 5d69322fad9e |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
94 |
3 e5ea8f9c7314 0 2 2 cf518031fa75 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
95 |
2 06055a7959d4 2 1 3 000000000000 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
96 |
1 28b51eb45704 1 1 2 5d69322fad9e |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
97 |
0 a9bdc8b26820 0 1 1 000000000000 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2118
diff
changeset
|
98 |
3 e5ea8f9c7314 1 1 2 cf518031fa75 |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
$ cd .. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
$ cd .. |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
101 |
|
2268
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
102 |
Actual Test for first version |
f2ebe960998b
tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
103 |
----------------------------- |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
104 |
|
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 |
$ dotest A.4 B -f |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 |
## Running testcase A.4 |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
107 |
# testing echange of "B" (06055a7959d4) |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 |
## initial state |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 |
# obstore: main |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
110 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
111 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 |
# obstore: pushdest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 |
# obstore: pulldest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 |
## pushing "B" from main to pushdest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
115 |
pushing to pushdest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
116 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
117 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
118 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
119 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
120 |
remote: added 2 changesets with 2 changes to 2 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
121 |
remote: 1 new obsolescence markers |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
122 |
## post push state |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 |
# obstore: main |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
124 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
125 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
# obstore: pushdest |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
127 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
# obstore: pulldest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
## pulling "06055a7959d4" from main into pulldest |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 |
pulling from main |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 |
searching for changes |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 |
adding changesets |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
133 |
adding manifests |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
134 |
adding file changes |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 |
added 2 changesets with 2 changes to 2 files |
1093
a49f2e7a2755
obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1089
diff
changeset
|
136 |
1 new obsolescence markers |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
137 |
new changesets 28b51eb45704:06055a7959d4 (2 drafts) |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
138 |
(run 'hg update' to get a working copy) |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
139 |
## post pull state |
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
140 |
# obstore: main |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
141 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
142 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
143 |
# obstore: pushdest |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
144 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
833
cf803a36e3fb
exchange: add test case for A.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
145 |
# obstore: pulldest |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
146 |
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |