author | Pierre-Yves David <pierre-yves.david@fb.com> |
Fri, 03 Apr 2015 11:34:02 -0700 | |
changeset 1237 | 1439bc8c6785 |
parent 1093 | a49f2e7a2755 |
child 2083 | 778afb036245 |
permissions | -rw-r--r-- |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
Initial setup |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
$ . $TESTDIR/_exc-util.sh |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
=== B.5 Push of a children of changeset which successors is pruned === |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
.. 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
|
12 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
.. {{{ |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
.. B ◔ |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 |
.. | |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 |
.. A⇠ø⇠⊗ A' |
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 |
.. ● O |
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 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
.. Marker exist from: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
.. * `Aø⇠○ A'` |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
.. * chain from A |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
.. * `A'` |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
.. Command run: |
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 |
.. * hg push -r B |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
.. Expected exchange: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
.. * `Aø⇠○ A'` |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
.. * chain from A |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
.. * `A'` |
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 |
.. Extra Note: |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
.. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
.. I'm not totally happy about this case and I believe some more complicated |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
.. graph can result in behavior wuite confusing for the user (if some tool create |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
.. prune maker in a the middle of a valid chain) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
$ setuprepos B.5 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
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
|
45 |
- pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
- main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |
- pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
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
|
49 |
$ cd main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
$ mkcommit A0 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
$ mkcommit B |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
$ hg up --quiet 0 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
$ mkcommit A1 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
created new head |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
$ hg prune -qd '0 0' . |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
$ hg log -G --hidden |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
x e5ea8f9c7314 (draft): A1 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
| |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
| o 06055a7959d4 (draft): B |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
| | |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
| x 28b51eb45704 (draft): A0 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
|/ |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
@ a9bdc8b26820 (public): O |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
$ hg debugobsolete |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
67 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
68 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
$ cd .. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
$ cd .. |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
$ cp -r B.5 B.5.a |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
$ cp -r B.5 B.5.b |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
|
984
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
75 |
Actual Test (explicit push version) |
b286f77d680c
tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents:
957
diff
changeset
|
76 |
----------------------------------- |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
$ dotest B.5.a B -f |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
## Running testcase B.5.a |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
# testing echange of "B" (06055a7959d4) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
## initial state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
# 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
|
83 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
84 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 |
# obstore: pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 |
# obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 |
## pushing "B" from main to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 |
pushing to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
89 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
90 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
91 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
92 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
93 |
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
|
94 |
remote: 2 new obsolescence markers |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 |
## post push state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
# 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
|
97 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
98 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
# 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
|
100 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
101 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |
# obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
103 |
## pulling "06055a7959d4" from main into pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
104 |
pulling from main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 |
searching for changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 |
adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
107 |
adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 |
adding file changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 |
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
|
110 |
2 new obsolescence markers |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 |
(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
|
112 |
1 new unstable changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 |
## post pull state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 |
# 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
|
115 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
116 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
117 |
# 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
|
118 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
119 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 |
# 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
|
121 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
122 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
124 |
Actual Test (bare push version) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
125 |
------------------------------------- |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
|
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
$ dotest B.5.b B -f |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
## Running testcase B.5.b |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
# testing echange of "B" (06055a7959d4) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 |
## initial state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 |
# 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
|
132 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
133 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
134 |
# obstore: pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 |
# obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 |
## pushing "B" from main to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
137 |
pushing to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
138 |
searching for changes |
1089
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
139 |
remote: adding changesets |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
140 |
remote: adding manifests |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
141 |
remote: adding file changes |
cdd22a5e5ef1
enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1088
diff
changeset
|
142 |
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
|
143 |
remote: 2 new obsolescence markers |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
144 |
## post push state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
145 |
# 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
|
146 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
147 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
148 |
# 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
|
149 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
150 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
151 |
# obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
152 |
## pulling "06055a7959d4" from main into pulldest |
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 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
158 |
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
|
159 |
2 new obsolescence markers |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
160 |
(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
|
161 |
1 new unstable changesets |
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 |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1060
diff
changeset
|
164 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
165 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
166 |
# 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
|
167 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
168 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
169 |
# 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
|
170 |
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
171 |
e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |