Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-A6.t @ 2798:2280461343e5 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.2 with the new stable branch content
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 03:41:15 +0200
parents 21f06d932231
children 67b59d1657cf
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
62 $ hg push -qf ../pulldest 62 $ hg push -qf ../pulldest
63 63
64 create a marker after this 64 create a marker after this
65 65
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
67 obsoleted 1 changesets
68 $ hg log -G --hidden 67 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1 68 @ e5ea8f9c7314 (draft): A1
70 | 69 |
71 | x 28b51eb45704 (draft): A0 70 | x 28b51eb45704 (draft): A0
72 |/ 71 |/
107 ## pushing "A1" from main to pushdest 106 ## pushing "A1" from main to pushdest
108 pushing to pushdest 107 pushing to pushdest
109 searching for changes 108 searching for changes
110 no changes found 109 no changes found
111 remote: 1 new obsolescence markers 110 remote: 1 new obsolescence markers
112 remote: obsoleted 1 changesets
113 ## post push state 111 ## post push state
114 # obstore: main 112 # obstore: main
115 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
116 # obstore: pushdest 114 # obstore: pushdest
117 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 115 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
118 # obstore: pulldest 116 # obstore: pulldest
119 ## pulling "e5ea8f9c7314" from main into pulldest 117 ## pulling "e5ea8f9c7314" from main into pulldest
120 pulling from main 118 pulling from main
121 no changes found 119 no changes found
122 1 new obsolescence markers 120 1 new obsolescence markers
123 obsoleted 1 changesets
124 ## post pull state 121 ## post pull state
125 # obstore: main 122 # obstore: main
126 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 123 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
127 # obstore: pushdest 124 # obstore: pushdest
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 125 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
142 ## pushing from main to pushdest 139 ## pushing from main to pushdest
143 pushing to pushdest 140 pushing to pushdest
144 searching for changes 141 searching for changes
145 no changes found 142 no changes found
146 remote: 1 new obsolescence markers 143 remote: 1 new obsolescence markers
147 remote: obsoleted 1 changesets
148 ## post push state 144 ## post push state
149 # obstore: main 145 # obstore: main
150 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 146 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
151 # obstore: pushdest 147 # obstore: pushdest
152 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 148 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
154 ## pulling from main into pulldest 150 ## pulling from main into pulldest
155 pulling from main 151 pulling from main
156 searching for changes 152 searching for changes
157 no changes found 153 no changes found
158 1 new obsolescence markers 154 1 new obsolescence markers
159 obsoleted 1 changesets
160 ## post pull state 155 ## post pull state
161 # obstore: main 156 # obstore: main
162 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 157 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
163 # obstore: pushdest 158 # obstore: pushdest
164 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 159 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}