Mercurial > evolve

comparison tests/test-exchange-B1.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
43 @ f5bc6836db60 (draft): A 43 @ f5bc6836db60 (draft): A
44 | 44 |
45 o a9bdc8b26820 (public): O 45 o a9bdc8b26820 (public): O
46 46
47 $ hg debugobsolete 47 $ hg debugobsolete
48 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 48 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
49 $ cd .. 49 $ cd ..
50 $ cd .. 50 $ cd ..
51 51
52 52
53 $ cp -r B.1 B.1.a 53 $ cp -r B.1 B.1.a
59 $ dotest B.1.a A 59 $ dotest B.1.a A
60 ## Running testcase B.1.a 60 ## Running testcase B.1.a
61 # testing echange of "A" (f5bc6836db60) 61 # testing echange of "A" (f5bc6836db60)
62 ## initial state 62 ## initial state
63 # obstore: main 63 # obstore: main
64 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 64 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
65 # obstore: pushdest 65 # obstore: pushdest
66 # obstore: pulldest 66 # obstore: pulldest
67 ## pushing "A" from main to pushdest 67 ## pushing "A" from main to pushdest
68 pushing to pushdest 68 pushing to pushdest
69 searching for changes 69 searching for changes
75 OBSEXC: computing markers relevant to 2 nodes 75 OBSEXC: computing markers relevant to 2 nodes
76 OBSEXC: pushing 1 obsolescence markers (89 bytes) 76 OBSEXC: pushing 1 obsolescence markers (89 bytes)
77 OBSEXC: DONE 77 OBSEXC: DONE
78 ## post push state 78 ## post push state
79 # obstore: main 79 # obstore: main
80 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 80 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
81 # obstore: pushdest 81 # obstore: pushdest
82 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 82 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
83 # obstore: pulldest 83 # obstore: pulldest
84 ## pulling "f5bc6836db60" from main into pulldest 84 ## pulling "f5bc6836db60" from main into pulldest
85 pulling from main 85 pulling from main
86 searching for changes 86 searching for changes
87 adding changesets 87 adding changesets
93 OBSEXC: 1 obsolescence markers added 93 OBSEXC: 1 obsolescence markers added
94 OBSEXC: DONE 94 OBSEXC: DONE
95 (run 'hg update' to get a working copy) 95 (run 'hg update' to get a working copy)
96 ## post pull state 96 ## post pull state
97 # obstore: main 97 # obstore: main
98 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 98 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
99 # obstore: pushdest 99 # obstore: pushdest
100 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 100 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
101 # obstore: pulldest 101 # obstore: pulldest
102 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 102 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
103 103
104 Actual Test (bare push version) 104 Actual Test (bare push version)
105 ----------------------------------- 105 -----------------------------------
106 106
107 $ dotest B.1.b 107 $ dotest B.1.b
108 ## Running testcase B.1.b 108 ## Running testcase B.1.b
109 ## initial state 109 ## initial state
110 # obstore: main 110 # obstore: main
111 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 111 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
112 # obstore: pushdest 112 # obstore: pushdest
113 # obstore: pulldest 113 # obstore: pulldest
114 ## pushing from main to pushdest 114 ## pushing from main to pushdest
115 pushing to pushdest 115 pushing to pushdest
116 searching for changes 116 searching for changes
122 OBSEXC: computing markers relevant to 2 nodes 122 OBSEXC: computing markers relevant to 2 nodes
123 OBSEXC: pushing 1 obsolescence markers (89 bytes) 123 OBSEXC: pushing 1 obsolescence markers (89 bytes)
124 OBSEXC: DONE 124 OBSEXC: DONE
125 ## post push state 125 ## post push state
126 # obstore: main 126 # obstore: main
127 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 127 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
128 # obstore: pushdest 128 # obstore: pushdest
129 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 129 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
130 # obstore: pulldest 130 # obstore: pulldest
131 ## pulling from main into pulldest 131 ## pulling from main into pulldest
132 pulling from main 132 pulling from main
133 searching for changes 133 searching for changes
134 adding changesets 134 adding changesets
140 OBSEXC: 1 obsolescence markers added 140 OBSEXC: 1 obsolescence markers added
141 OBSEXC: DONE 141 OBSEXC: DONE
142 (run 'hg update' to get a working copy) 142 (run 'hg update' to get a working copy)
143 ## post pull state 143 ## post pull state
144 # obstore: main 144 # obstore: main
145 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 145 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
146 # obstore: pushdest 146 # obstore: pushdest
147 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 147 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
148 # obstore: pulldest 148 # obstore: pulldest
149 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 149 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}