author | Pierre-Yves David <pierre-yves.david@fb.com> |
Tue, 17 Nov 2015 20:25:15 -0800 | |
changeset 1535 | f6d10432499d |
parent 1093 | a49f2e7a2755 |
child 2083 | 778afb036245 |
permissions | -rw-r--r-- |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 |
Initial setup |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 |
$ . $TESTDIR/_exc-util.sh |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 |
=== B.3 Pruned changeset on non-pushed part of the history === |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
.. {{{ |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
.. ⊗ C |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
.. | |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
.. ○ B |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
.. | ◔ A |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
.. |/ |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 |
.. ● O |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 |
.. }}} |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
.. Marker exist from: |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
.. * C (prune) |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. Command run: |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
.. * hg push -r A |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
.. * hg push |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
.. Expected exchange: |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
.. * ø |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. Expected Exclude: |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
.. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
.. * chain from B |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
$ setuprepos B.3 |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
creating test repo for test case B.3 |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
- pulldest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
- main |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
- pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
cd into `main` and proceed with env setup |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
$ cd main |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
$ mkcommit A |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
$ hg up --quiet 0 |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
$ mkcommit B |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
created new head |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |
$ mkcommit C |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
$ hg prune -qd '0 0' . |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
$ hg log -G --hidden |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
x e56289ab6378 (draft): C |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
| |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
@ 35b183996678 (draft): B |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
| |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
| o f5bc6836db60 (draft): A |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
|/ |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
o a9bdc8b26820 (public): O |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
$ hg debugobsolete |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
59 |
e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
$ cd .. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
$ cd .. |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
Actual Test |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
----------------------------------- |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
|
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
$ dotest B.3 A |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
## Running testcase B.3 |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
# testing echange of "A" (f5bc6836db60) |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
## initial state |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
# obstore: main |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
72 |
e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
# obstore: pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
# obstore: pulldest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
## pushing "A" from main to pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 |
pushing to pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
78 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
79 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
80 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
81 |
remote: added 1 changesets with 1 changes to 1 files |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
## post push state |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 |
# obstore: main |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
84 |
e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 |
# obstore: pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 |
# obstore: pulldest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 |
## pulling "f5bc6836db60" from main into pulldest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 |
pulling from main |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
89 |
searching for changes |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
90 |
adding changesets |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
91 |
adding manifests |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 |
adding file changes |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 |
added 1 changesets with 1 changes to 1 files |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 |
(run 'hg update' to get a working copy) |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 |
## post pull state |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
# obstore: main |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
97 |
e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
839
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
# obstore: pushdest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
# obstore: pulldest |
b4f696ad9dee
exchange: add test case for B.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |