Mercurial > hg
comparison tests/test-bookmarks-corner-case.t @ 42546:904e0da2e195
merge with stable
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 30 Jun 2019 15:10:56 +0900 |
parents | 84aff7e20c55 2c27b7fadcd3 |
children | 811e502d646d |
comparison
equal
deleted
inserted
replaced
42544:2702dfc7e029 | 42546:904e0da2e195 |
---|---|
199 Check raced push output. | 199 Check raced push output. |
200 | 200 |
201 $ cat push-output.txt | 201 $ cat push-output.txt |
202 pushing to ssh://user@dummy/bookrace-server | 202 pushing to ssh://user@dummy/bookrace-server |
203 searching for changes | 203 searching for changes |
204 remote has heads on branch 'default' that are not known locally: f26c3b5167d1 | |
205 remote: setting raced push up | 204 remote: setting raced push up |
206 remote: adding changesets | 205 remote: adding changesets |
207 remote: adding manifests | 206 remote: adding manifests |
208 remote: adding file changes | 207 remote: adding file changes |
209 remote: added 1 changesets with 1 changes to 1 files | 208 remote: added 1 changesets with 1 changes to 1 files |
219 | user: test | 218 | user: test |
220 | date: Thu Jan 01 00:00:00 1970 +0000 | 219 | date: Thu Jan 01 00:00:00 1970 +0000 |
221 | summary: A1 | 220 | summary: A1 |
222 | | 221 | |
223 | o changeset: 3:f26c3b5167d1 | 222 | o changeset: 3:f26c3b5167d1 |
224 | | bookmark: book-B | 223 | | bookmark: book-B (false !) |
225 | | user: test | 224 | | user: test |
226 | | date: Thu Jan 01 00:00:00 1970 +0000 | 225 | | date: Thu Jan 01 00:00:00 1970 +0000 |
227 | | summary: B1 | 226 | | summary: B1 |
228 | | | 227 | | |
229 | o changeset: 2:c79985706978 | 228 | o changeset: 2:c79985706978 |
242 date: Thu Jan 01 00:00:00 1970 +0000 | 241 date: Thu Jan 01 00:00:00 1970 +0000 |
243 summary: root | 242 summary: root |
244 | 243 |
245 $ hg -R bookrace-server book | 244 $ hg -R bookrace-server book |
246 book-A 4:9ce3b28c16de | 245 book-A 4:9ce3b28c16de |
247 book-B 3:f26c3b5167d1 | 246 book-B 3:f26c3b5167d1 (false !) |