Mercurial > evolve

comparison tests/test-exchange-B2.t @ 1067:5d063fed9e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 20 Aug 2014 20:49:48 -0700
parents f355bbc124fc
children 5717d023da63
comparison
equal deleted inserted replaced
1066:045f7de9e4d3 1067:5d063fed9e3d
38 x f5bc6836db60 (draft): A 38 x f5bc6836db60 (draft): A
39 | 39 |
40 @ a9bdc8b26820 (public): O 40 @ a9bdc8b26820 (public): O
41 41
42 $ hg debugobsolete 42 $ hg debugobsolete
43 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 43 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
44 $ cd .. 44 $ cd ..
45 $ cd .. 45 $ cd ..
46 46
47 47
48 $ cp -r B.2 B.2.a 48 $ cp -r B.2 B.2.a
54 $ dotest B.2.a O 54 $ dotest B.2.a O
55 ## Running testcase B.2.a 55 ## Running testcase B.2.a
56 # testing echange of "O" (a9bdc8b26820) 56 # testing echange of "O" (a9bdc8b26820)
57 ## initial state 57 ## initial state
58 # obstore: main 58 # obstore: main
59 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 59 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
60 # obstore: pushdest 60 # obstore: pushdest
61 # obstore: pulldest 61 # obstore: pulldest
62 ## pushing "O" from main to pushdest 62 ## pushing "O" from main to pushdest
63 pushing to pushdest 63 pushing to pushdest
64 searching for changes 64 searching for changes
67 OBSEXC: computing markers relevant to 1 nodes 67 OBSEXC: computing markers relevant to 1 nodes
68 OBSEXC: pushing 1 obsolescence markers (89 bytes) 68 OBSEXC: pushing 1 obsolescence markers (89 bytes)
69 OBSEXC: DONE 69 OBSEXC: DONE
70 ## post push state 70 ## post push state
71 # obstore: main 71 # obstore: main
72 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 72 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
73 # obstore: pushdest 73 # obstore: pushdest
74 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 74 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
75 # obstore: pulldest 75 # obstore: pulldest
76 ## pulling "a9bdc8b26820" from main into pulldest 76 ## pulling "a9bdc8b26820" from main into pulldest
77 pulling from main 77 pulling from main
78 no changes found 78 no changes found
79 OBSEXC: pull obsolescence markers 79 OBSEXC: pull obsolescence markers
80 OBSEXC: merging obsolescence markers (89 bytes) 80 OBSEXC: merging obsolescence markers (89 bytes)
81 OBSEXC: 1 obsolescence markers added 81 OBSEXC: 1 obsolescence markers added
82 OBSEXC: DONE 82 OBSEXC: DONE
83 ## post pull state 83 ## post pull state
84 # obstore: main 84 # obstore: main
85 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 85 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
86 # obstore: pushdest 86 # obstore: pushdest
87 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 87 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
88 # obstore: pulldest 88 # obstore: pulldest
89 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 89 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
90 90
91 Actual Test (bare push version) 91 Actual Test (bare push version)
92 ----------------------------------- 92 -----------------------------------
93 93
94 $ dotest B.2.b 94 $ dotest B.2.b
95 ## Running testcase B.2.b 95 ## Running testcase B.2.b
96 ## initial state 96 ## initial state
97 # obstore: main 97 # obstore: main
98 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 98 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
99 # obstore: pushdest 99 # obstore: pushdest
100 # obstore: pulldest 100 # obstore: pulldest
101 ## pushing from main to pushdest 101 ## pushing from main to pushdest
102 pushing to pushdest 102 pushing to pushdest
103 searching for changes 103 searching for changes
106 OBSEXC: computing markers relevant to 1 nodes 106 OBSEXC: computing markers relevant to 1 nodes
107 OBSEXC: pushing 1 obsolescence markers (89 bytes) 107 OBSEXC: pushing 1 obsolescence markers (89 bytes)
108 OBSEXC: DONE 108 OBSEXC: DONE
109 ## post push state 109 ## post push state
110 # obstore: main 110 # obstore: main
111 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 111 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
112 # obstore: pushdest 112 # obstore: pushdest
113 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 113 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
114 # obstore: pulldest 114 # obstore: pulldest
115 ## pulling from main into pulldest 115 ## pulling from main into pulldest
116 pulling from main 116 pulling from main
117 searching for changes 117 searching for changes
118 no changes found 118 no changes found
120 OBSEXC: merging obsolescence markers (89 bytes) 120 OBSEXC: merging obsolescence markers (89 bytes)
121 OBSEXC: 1 obsolescence markers added 121 OBSEXC: 1 obsolescence markers added
122 OBSEXC: DONE 122 OBSEXC: DONE
123 ## post pull state 123 ## post pull state
124 # obstore: main 124 # obstore: main
125 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 125 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
126 # obstore: pushdest 126 # obstore: pushdest
127 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 127 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
128 # obstore: pulldest 128 # obstore: pulldest
129 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} 129 f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}