Mercurial > evolve
annotate tests/test-exchange-B5.t @ 1069:356552e55489
evolve: always use the transaction version of phase movement
This drop compat with all known released version of Mercurial.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 27 Aug 2014 10:21:30 +0200 |
parents | 5d063fed9e3d |
children | 5717d023da63 |
rev | line source |
---|---|
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 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
90 adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
91 adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 adding file changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 added 2 changesets with 2 changes to 2 files |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 OBSEXC: computing relevant nodes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 OBSEXC: computing markers relevant to 3 nodes |
1060
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
96 OBSEXC: pushing 2 obsolescence markers (153 bytes) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 OBSEXC: DONE |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 ## post push state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 # 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
|
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: 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
|
103 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
|
104 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
|
105 # obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 ## 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
|
107 pulling from main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 searching for changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
110 adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 adding file changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 added 2 changesets with 2 changes to 2 files |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 OBSEXC: pull obsolescence markers |
1060
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
114 OBSEXC: merging obsolescence markers (153 bytes) |
1040
640f3280559e
evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1037
diff
changeset
|
115 OBSEXC: 2 obsolescence markers added |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
116 OBSEXC: DONE |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
117 (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
|
118 1 new unstable changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 ## post pull state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 # 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
|
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 # 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
|
124 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
|
125 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
|
126 # 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
|
127 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
|
128 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
|
129 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 Actual Test (bare push version) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 ------------------------------------- |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
133 $ 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
|
134 ## Running testcase B.5.b |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 # testing echange of "B" (06055a7959d4) |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 ## initial state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
137 # 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
|
138 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
|
139 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
|
140 # obstore: pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
141 # obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
142 ## 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
|
143 pushing to pushdest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
144 searching for changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
145 adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
146 adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
147 adding file changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
148 added 2 changesets with 2 changes to 2 files |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
149 OBSEXC: computing relevant nodes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
150 OBSEXC: computing markers relevant to 3 nodes |
1060
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
151 OBSEXC: pushing 2 obsolescence markers (153 bytes) |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
152 OBSEXC: DONE |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
153 ## post push state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
154 # 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
|
155 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
|
156 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
|
157 # 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
|
158 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
|
159 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
|
160 # obstore: pulldest |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
161 ## 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
|
162 pulling from main |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
163 searching for changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
164 adding changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
165 adding manifests |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
166 adding file changes |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
167 added 2 changesets with 2 changes to 2 files |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
168 OBSEXC: pull obsolescence markers |
1060
f6e0cfca1bf0
test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
169 OBSEXC: merging obsolescence markers (153 bytes) |
1040
640f3280559e
evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1037
diff
changeset
|
170 OBSEXC: 2 obsolescence markers added |
841
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
171 OBSEXC: DONE |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
172 (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
|
173 1 new unstable changesets |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
174 ## post pull state |
07891b3308a2
exchange: add test case for B.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
175 # 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
|
176 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
|
177 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
|
178 # 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
|
179 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
|
180 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
|
181 # 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
|
182 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
|
183 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |