API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 13th, 2017
588
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 145.69 KB | None | 0 0
raw download clone embed print report
  1. rupert@build10s:~/hg-crew-10s/tests
  2. $ ./run-tests.py -j $(psrinfo | wc -l)
  3. ..
  4. ERROR: /home/rupert/hg-crew-10s/tests/test-bad-pull output changed
  5. --- /home/rupert/hg-crew-10s/tests/test-bad-pull.out
  6. +++ /home/rupert/hg-crew-10s/tests/test-bad-pull.err
  7. -1,4 +1,4 @@
  8. -abort: error: Connection refused
  9. +abort: error: Network is unreachable
  10. 255
  11. copy: No such file or directory
  12. abort: HTTP Error 404
  13. !.......ss.s.......ss.............s.s.............s..........s....s...s.s
  14. ERROR: /home/rupert/hg-crew-10s/tests/test-gendoc output changed and returned error code 1
  15. --- /home/rupert/hg-crew-10s/tests/test-gendoc.out
  16. +++ /home/rupert/hg-crew-10s/tests/test-gendoc.err
  17. -1,33 +1,55 @@
  18. +sh: rst2html: not found
  19.  
  20. % extracting documentation from C
  21. checking for parse errors with rst2html
  22. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  23.  
  24. % extracting documentation from da
  25. +couldn't set locale correctly
  26. checking for parse errors with rst2html
  27. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  28.  
  29. % extracting documentation from de
  30. +couldn't set locale correctly
  31. checking for parse errors with rst2html
  32. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  33.  
  34. % extracting documentation from el
  35. +couldn't set locale correctly
  36. checking for parse errors with rst2html
  37. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  38.  
  39. % extracting documentation from fr
  40. +couldn't set locale correctly
  41. checking for parse errors with rst2html
  42. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  43.  
  44. % extracting documentation from it
  45. +couldn't set locale correctly
  46. checking for parse errors with rst2html
  47. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  48.  
  49. % extracting documentation from ja
  50. +couldn't set locale correctly
  51. checking for parse errors with rst2html
  52. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  53.  
  54. % extracting documentation from pt_BR
  55. +couldn't set locale correctly
  56. checking for parse errors with rst2html
  57. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  58.  
  59. % extracting documentation from sv
  60. +couldn't set locale correctly
  61. checking for parse errors with rst2html
  62. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  63.  
  64. % extracting documentation from zh_CN
  65. +couldn't set locale correctly
  66. checking for parse errors with rst2html
  67. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  68.  
  69. % extracting documentation from zh_TW
  70. +couldn't set locale correctly
  71. checking for parse errors with rst2html
  72. +/home/rupert/hg-crew-10s/tests/test-gendoc: no: not found
  73. !s.......
  74. ERROR: /home/rupert/hg-crew-10s/tests/test-extension output changed
  75. --- /home/rupert/hg-crew-10s/tests/test-extension.out
  76. +++ /home/rupert/hg-crew-10s/tests/test-extension.err
  77. -102,12 +102,7 @@
  78. patchbomb command to send changesets as (a series of) patch emails
  79.  
  80. use "hg help extensions" for information on enabling extensions
  81. -hg: unknown command 'qdel'
  82. -'qdelete' is provided by the following extension:
  83. -
  84. - mq manage a stack of patches
  85. -
  86. -use "hg help extensions" for information on enabling extensions
  87. +abort: There is no Mercurial repository here (.hg not found)!
  88. hg: unknown command 'churn'
  89. 'churn' is provided by the following extension:
  90.  
  91. -122,7 +117,9 @@
  92.  
  93. use "hg help extensions" for information on enabling extensions
  94. % broken disabled extension and command
  95. +*** failed to import extension mq: No module named mq
  96. broken extension - (no help text available)
  97.  
  98. use "hg help extensions" for information on enabling extensions
  99. +*** failed to import extension mq: No module named mq
  100. hg: unknown command 'foo'
  101. !s.
  102. ERROR: /home/rupert/hg-crew-10s/tests/test-bisect output changed and returned error code 208
  103. --- /home/rupert/hg-crew-10s/tests/test-bisect.out
  104. +++ /home/rupert/hg-crew-10s/tests/test-bisect.err
  105. -1,321 +1,2 @@
  106. -% init
  107. -% committing changes
  108. -adding a
  109. -% committed changeset 0
  110. -% committed changeset 1
  111. -% committed changeset 2
  112. -% committed changeset 3
  113. -% committed changeset 4
  114. -% committed changeset 5
  115. -% committed changeset 6
  116. -% committed changeset 7
  117. -% committed changeset 8
  118. -% committed changeset 9
  119. -% committed changeset 10
  120. -% committed changeset 11
  121. -% committed changeset 12
  122. -% committed changeset 13
  123. -% committed changeset 14
  124. -% committed changeset 15
  125. -% committed changeset 16
  126. -% committed changeset 17
  127. -% committed changeset 18
  128. -% committed changeset 19
  129. -% committed changeset 20
  130. -% committed changeset 21
  131. -% committed changeset 22
  132. -% committed changeset 23
  133. -% committed changeset 24
  134. -% committed changeset 25
  135. -% committed changeset 26
  136. -% committed changeset 27
  137. -% committed changeset 28
  138. -% committed changeset 29
  139. -% committed changeset 30
  140. -% committed changeset 31
  141. -% log
  142. -changeset: 31:58c80a7c8a40
  143. -tag: tip
  144. -user: test
  145. -date: Thu Jan 01 00:00:31 1970 +0000
  146. -summary: msg 31
  147.  
  148. -changeset: 30:ed2d2f24b11c
  149. -user: test
  150. -date: Thu Jan 01 00:00:30 1970 +0000
  151. -summary: msg 30
  152. -
  153. -changeset: 29:b5bd63375ab9
  154. -user: test
  155. -date: Thu Jan 01 00:00:29 1970 +0000
  156. -summary: msg 29
  157. -
  158. -changeset: 28:8e0c2264c8af
  159. -user: test
  160. -date: Thu Jan 01 00:00:28 1970 +0000
  161. -summary: msg 28
  162. -
  163. -changeset: 27:288867a866e9
  164. -user: test
  165. -date: Thu Jan 01 00:00:27 1970 +0000
  166. -summary: msg 27
  167. -
  168. -changeset: 26:3efc6fd51aeb
  169. -user: test
  170. -date: Thu Jan 01 00:00:26 1970 +0000
  171. -summary: msg 26
  172. -
  173. -changeset: 25:02a84173a97a
  174. -user: test
  175. -date: Thu Jan 01 00:00:25 1970 +0000
  176. -summary: msg 25
  177. -
  178. -changeset: 24:10e0acd3809e
  179. -user: test
  180. -date: Thu Jan 01 00:00:24 1970 +0000
  181. -summary: msg 24
  182. -
  183. -changeset: 23:5ec79163bff4
  184. -user: test
  185. -date: Thu Jan 01 00:00:23 1970 +0000
  186. -summary: msg 23
  187. -
  188. -changeset: 22:06c7993750ce
  189. -user: test
  190. -date: Thu Jan 01 00:00:22 1970 +0000
  191. -summary: msg 22
  192. -
  193. -changeset: 21:e5db6aa3fe2a
  194. -user: test
  195. -date: Thu Jan 01 00:00:21 1970 +0000
  196. -summary: msg 21
  197. -
  198. -changeset: 20:7128fb4fdbc9
  199. -user: test
  200. -date: Thu Jan 01 00:00:20 1970 +0000
  201. -summary: msg 20
  202. -
  203. -changeset: 19:52798545b482
  204. -user: test
  205. -date: Thu Jan 01 00:00:19 1970 +0000
  206. -summary: msg 19
  207. -
  208. -changeset: 18:86977a90077e
  209. -user: test
  210. -date: Thu Jan 01 00:00:18 1970 +0000
  211. -summary: msg 18
  212. -
  213. -changeset: 17:03515f4a9080
  214. -user: test
  215. -date: Thu Jan 01 00:00:17 1970 +0000
  216. -summary: msg 17
  217. -
  218. -changeset: 16:a2e6ea4973e9
  219. -user: test
  220. -date: Thu Jan 01 00:00:16 1970 +0000
  221. -summary: msg 16
  222. -
  223. -changeset: 15:e7fa0811edb0
  224. -user: test
  225. -date: Thu Jan 01 00:00:15 1970 +0000
  226. -summary: msg 15
  227. -
  228. -changeset: 14:ce8f0998e922
  229. -user: test
  230. -date: Thu Jan 01 00:00:14 1970 +0000
  231. -summary: msg 14
  232. -
  233. -changeset: 13:9d7d07bc967c
  234. -user: test
  235. -date: Thu Jan 01 00:00:13 1970 +0000
  236. -summary: msg 13
  237. -
  238. -changeset: 12:1941b52820a5
  239. -user: test
  240. -date: Thu Jan 01 00:00:12 1970 +0000
  241. -summary: msg 12
  242. -
  243. -changeset: 11:7b4cd9578619
  244. -user: test
  245. -date: Thu Jan 01 00:00:11 1970 +0000
  246. -summary: msg 11
  247. -
  248. -changeset: 10:7c5eff49a6b6
  249. -user: test
  250. -date: Thu Jan 01 00:00:10 1970 +0000
  251. -summary: msg 10
  252. -
  253. -changeset: 9:eb44510ef29a
  254. -user: test
  255. -date: Thu Jan 01 00:00:09 1970 +0000
  256. -summary: msg 9
  257. -
  258. -changeset: 8:453eb4dba229
  259. -user: test
  260. -date: Thu Jan 01 00:00:08 1970 +0000
  261. -summary: msg 8
  262. -
  263. -changeset: 7:03750880c6b5
  264. -user: test
  265. -date: Thu Jan 01 00:00:07 1970 +0000
  266. -summary: msg 7
  267. -
  268. -changeset: 6:a3d5c6fdf0d3
  269. -user: test
  270. -date: Thu Jan 01 00:00:06 1970 +0000
  271. -summary: msg 6
  272. -
  273. -changeset: 5:7874a09ea728
  274. -user: test
  275. -date: Thu Jan 01 00:00:05 1970 +0000
  276. -summary: msg 5
  277. -
  278. -changeset: 4:9b2ba8336a65
  279. -user: test
  280. -date: Thu Jan 01 00:00:04 1970 +0000
  281. -summary: msg 4
  282. -
  283. -changeset: 3:b53bea5e2fcb
  284. -user: test
  285. -date: Thu Jan 01 00:00:03 1970 +0000
  286. -summary: msg 3
  287. -
  288. -changeset: 2:db07c04beaca
  289. -user: test
  290. -date: Thu Jan 01 00:00:02 1970 +0000
  291. -summary: msg 2
  292. -
  293. -changeset: 1:5cd978ea5149
  294. -user: test
  295. -date: Thu Jan 01 00:00:01 1970 +0000
  296. -summary: msg 1
  297. -
  298. -changeset: 0:b99c7b9c8e11
  299. -user: test
  300. -date: Thu Jan 01 00:00:00 1970 +0000
  301. -summary: msg 0
  302. -
  303. -% hg up -C
  304. -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  305. -% bisect test
  306. -Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
  307. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  308. -Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
  309. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  310. -skip
  311. -Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
  312. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  313. -Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
  314. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  315. -Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
  316. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  317. -Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
  318. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  319. -The first bad revision is:
  320. -changeset: 29:b5bd63375ab9
  321. -user: test
  322. -date: Thu Jan 01 00:00:29 1970 +0000
  323. -summary: msg 29
  324. -
  325. -% bisect reverse test
  326. -Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
  327. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  328. -Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
  329. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  330. -skip
  331. -Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
  332. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  333. -Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
  334. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  335. -Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
  336. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  337. -Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
  338. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  339. -The first good revision is:
  340. -changeset: 1:5cd978ea5149
  341. -user: test
  342. -date: Thu Jan 01 00:00:01 1970 +0000
  343. -summary: msg 1
  344. -
  345. -abort: Inconsistent state, 31:58c80a7c8a40 is good and bad
  346. -error
  347. -Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
  348. -5cd978ea5149
  349. -% reproduce AssertionError, issue1228 and issue1182
  350. -Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
  351. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  352. -Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
  353. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  354. -Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
  355. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  356. -Due to skipped revisions, the first bad revision could be any of:
  357. -changeset: 1:5cd978ea5149
  358. -user: test
  359. -date: Thu Jan 01 00:00:01 1970 +0000
  360. -summary: msg 1
  361. -
  362. -changeset: 2:db07c04beaca
  363. -user: test
  364. -date: Thu Jan 01 00:00:02 1970 +0000
  365. -summary: msg 2
  366. -
  367. -changeset: 3:b53bea5e2fcb
  368. -user: test
  369. -date: Thu Jan 01 00:00:03 1970 +0000
  370. -summary: msg 3
  371. -
  372. -changeset: 4:9b2ba8336a65
  373. -user: test
  374. -date: Thu Jan 01 00:00:04 1970 +0000
  375. -summary: msg 4
  376. -
  377. -% reproduce non converging bisect, issue1182
  378. -Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
  379. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  380. -Due to skipped revisions, the first bad revision could be any of:
  381. -changeset: 1:5cd978ea5149
  382. -user: test
  383. -date: Thu Jan 01 00:00:01 1970 +0000
  384. -summary: msg 1
  385. -
  386. -changeset: 2:db07c04beaca
  387. -user: test
  388. -date: Thu Jan 01 00:00:02 1970 +0000
  389. -summary: msg 2
  390. -
  391. -% test no action
  392. -abort: cannot bisect (no known good revisions)
  393. -failure
  394. -% reproduce AssertionError, issue1445
  395. -Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
  396. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  397. -Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
  398. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  399. -Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
  400. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  401. -Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
  402. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  403. -Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
  404. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  405. -The first bad revision is:
  406. -changeset: 6:a3d5c6fdf0d3
  407. -user: test
  408. -date: Thu Jan 01 00:00:06 1970 +0000
  409. -summary: msg 6
  410. -
  411. -% test invalid command
  412. -abort: failed to execute exit 127
  413. -% test bisecting command
  414. -Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
  415. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  416. -Changeset 15:e7fa0811edb0: good
  417. -Changeset 7:03750880c6b5: good
  418. -Changeset 3:b53bea5e2fcb: bad
  419. -Changeset 5:7874a09ea728: bad
  420. -Changeset 6:a3d5c6fdf0d3: good
  421. -The first good revision is:
  422. -changeset: 6:a3d5c6fdf0d3
  423. -user: test
  424. -date: Thu Jan 01 00:00:06 1970 +0000
  425. -summary: msg 6
  426. -
  427. +### Abort: timeout after 180 seconds.
  428. !............s...................
  429. ERROR: /home/rupert/hg-crew-10s/tests/test-http-proxy output changed
  430. --- /home/rupert/hg-crew-10s/tests/test-http-proxy.out
  431. +++ /home/rupert/hg-crew-10s/tests/test-http-proxy.err
  432. -48,7 +48,7 @@
  433. updating to branch default
  434. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  435. %% bad host:port for proxy
  436. -abort: error: Connection refused
  437. +abort: error: Network is unreachable
  438. %% do not use the proxy if it is in the no list
  439. requesting all changes
  440. adding changesets
  441. !.............
  442. ERROR: /home/rupert/hg-crew-10s/tests/test-bundle-r output changed and returned error code 208
  443. --- /home/rupert/hg-crew-10s/tests/test-bundle-r.out
  444. +++ /home/rupert/hg-crew-10s/tests/test-bundle-r.err
  445. -1,249 +1,2 @@
  446. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  447. -created new head
  448. -1 files updated, 0 files merged, 2 files removed, 0 files unresolved
  449. - rev offset length base linkrev nodeid p1 p2
  450. - 0 0 3 0 0 362fef284ce2 000000000000 000000000000
  451. - 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
  452. - 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
  453. - 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
  454. - rev offset length base linkrev nodeid p1 p2
  455. - 0 0 75 0 7 2565f3199a74 000000000000 000000000000
  456. - rev offset length base linkrev nodeid p1 p2
  457. - 0 0 75 0 8 2565f3199a74 000000000000 000000000000
  458. - rev offset length base linkrev nodeid p1 p2
  459. - 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
  460. - rev offset length base linkrev nodeid p1 p2
  461. - 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
  462. - 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
  463. - 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
  464. - 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
  465. - 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
  466. - 5 250 68 3 7 09bb521d218d de68e904d169 000000000000
  467. - 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
  468. -checking changesets
  469. -checking manifests
  470. -crosschecking files in changesets and manifests
  471. -checking files
  472. -4 files, 9 changesets, 7 total revisions
  473. -searching for changes
  474. -1 changesets found
  475. -adding changesets
  476. -adding manifests
  477. -adding file changes
  478. -added 1 changesets with 1 changes to 1 files
  479. -(run 'hg update' to get a working copy)
  480. -checking changesets
  481. -checking manifests
  482. -crosschecking files in changesets and manifests
  483. -checking files
  484. -1 files, 1 changesets, 1 total revisions
  485. -0:5649c9d34dd8
  486. -searching for changes
  487. -2 changesets found
  488. -adding changesets
  489. -adding manifests
  490. -adding file changes
  491. -added 2 changesets with 2 changes to 1 files
  492. -(run 'hg update' to get a working copy)
  493. -checking changesets
  494. -checking manifests
  495. -crosschecking files in changesets and manifests
  496. -checking files
  497. -1 files, 2 changesets, 2 total revisions
  498. -1:10b2180f755b
  499. -searching for changes
  500. -3 changesets found
  501. -adding changesets
  502. -adding manifests
  503. -adding file changes
  504. -added 3 changesets with 3 changes to 1 files
  505. -(run 'hg update' to get a working copy)
  506. -checking changesets
  507. -checking manifests
  508. -crosschecking files in changesets and manifests
  509. -checking files
  510. -1 files, 3 changesets, 3 total revisions
  511. -2:d62976ca1e50
  512. -searching for changes
  513. -4 changesets found
  514. -adding changesets
  515. -adding manifests
  516. -adding file changes
  517. -added 4 changesets with 4 changes to 1 files
  518. -(run 'hg update' to get a working copy)
  519. -checking changesets
  520. -checking manifests
  521. -crosschecking files in changesets and manifests
  522. -checking files
  523. -1 files, 4 changesets, 4 total revisions
  524. -3:ac69c658229d
  525. -searching for changes
  526. -2 changesets found
  527. -adding changesets
  528. -adding manifests
  529. -adding file changes
  530. -added 2 changesets with 2 changes to 1 files
  531. -(run 'hg update' to get a working copy)
  532. -checking changesets
  533. -checking manifests
  534. -crosschecking files in changesets and manifests
  535. -checking files
  536. -1 files, 2 changesets, 2 total revisions
  537. -1:5f4f3ceb285e
  538. -searching for changes
  539. -3 changesets found
  540. -adding changesets
  541. -adding manifests
  542. -adding file changes
  543. -added 3 changesets with 3 changes to 1 files
  544. -(run 'hg update' to get a working copy)
  545. -checking changesets
  546. -checking manifests
  547. -crosschecking files in changesets and manifests
  548. -checking files
  549. -1 files, 3 changesets, 3 total revisions
  550. -2:024e4e7df376
  551. -searching for changes
  552. -4 changesets found
  553. -adding changesets
  554. -adding manifests
  555. -adding file changes
  556. -added 4 changesets with 5 changes to 2 files
  557. -(run 'hg update' to get a working copy)
  558. -checking changesets
  559. -checking manifests
  560. -crosschecking files in changesets and manifests
  561. -checking files
  562. -2 files, 4 changesets, 5 total revisions
  563. -3:1e3f6b843bd6
  564. -searching for changes
  565. -5 changesets found
  566. -adding changesets
  567. -adding manifests
  568. -adding file changes
  569. -added 5 changesets with 6 changes to 3 files
  570. -(run 'hg update' to get a working copy)
  571. -checking changesets
  572. -checking manifests
  573. -crosschecking files in changesets and manifests
  574. -checking files
  575. -3 files, 5 changesets, 6 total revisions
  576. -4:27f57c869697
  577. -searching for changes
  578. -5 changesets found
  579. -adding changesets
  580. -adding manifests
  581. -adding file changes
  582. -added 5 changesets with 5 changes to 2 files
  583. -(run 'hg update' to get a working copy)
  584. -checking changesets
  585. -checking manifests
  586. -crosschecking files in changesets and manifests
  587. -checking files
  588. -2 files, 5 changesets, 5 total revisions
  589. -4:088ff9d6e1e1
  590. -pulling from ../test-7
  591. -searching for changes
  592. -adding changesets
  593. -adding manifests
  594. -adding file changes
  595. -added 4 changesets with 2 changes to 3 files (+1 heads)
  596. -(run 'hg heads' to see heads, 'hg merge' to merge)
  597. -checking changesets
  598. -checking manifests
  599. -crosschecking files in changesets and manifests
  600. -checking files
  601. -4 files, 9 changesets, 7 total revisions
  602. -rolling back last transaction
  603. -% should fail
  604. -abort: --base is incompatible with specifying a destination
  605. -abort: repository default-push not found!
  606. -2 changesets found
  607. -4 changesets found
  608. -6 changesets found
  609. -1 changesets found
  610. -1 changesets found
  611. -4 changesets found
  612. -updating to branch default
  613. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  614. -% 2
  615. -2:d62976ca1e50
  616. -adding changesets
  617. -transaction abort!
  618. -rollback completed
  619. -abort: 00changelog.i@ac69c658229d: unknown parent!
  620. -% 2
  621. -2:d62976ca1e50
  622. -adding changesets
  623. -adding manifests
  624. -adding file changes
  625. -added 6 changesets with 4 changes to 4 files (+1 heads)
  626. -(run 'hg heads' to see heads, 'hg merge' to merge)
  627. -% 8
  628. -8:088ff9d6e1e1
  629. -checking changesets
  630. -checking manifests
  631. -crosschecking files in changesets and manifests
  632. -checking files
  633. -4 files, 9 changesets, 7 total revisions
  634. -rolling back last transaction
  635. -% 2
  636. -2:d62976ca1e50
  637. -adding changesets
  638. -adding manifests
  639. -adding file changes
  640. -added 2 changesets with 2 changes to 2 files
  641. -(run 'hg update' to get a working copy)
  642. -% 4
  643. -4:088ff9d6e1e1
  644. -checking changesets
  645. -checking manifests
  646. -crosschecking files in changesets and manifests
  647. -checking files
  648. -2 files, 5 changesets, 5 total revisions
  649. -rolling back last transaction
  650. -adding changesets
  651. -adding manifests
  652. -adding file changes
  653. -added 4 changesets with 3 changes to 3 files (+1 heads)
  654. -(run 'hg heads' to see heads, 'hg merge' to merge)
  655. -% 6
  656. -6:27f57c869697
  657. -checking changesets
  658. -checking manifests
  659. -crosschecking files in changesets and manifests
  660. -checking files
  661. -3 files, 7 changesets, 6 total revisions
  662. -rolling back last transaction
  663. -adding changesets
  664. -adding manifests
  665. -adding file changes
  666. -added 2 changesets with 2 changes to 2 files
  667. -(run 'hg update' to get a working copy)
  668. -% 4
  669. -4:088ff9d6e1e1
  670. -checking changesets
  671. -checking manifests
  672. -crosschecking files in changesets and manifests
  673. -checking files
  674. -2 files, 5 changesets, 5 total revisions
  675. -warning: detected divergent renames of afile to:
  676. - anotherfile
  677. - adifferentfile
  678. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  679. -(branch merge, don't forget to commit)
  680. -7 changesets found
  681. -updating to branch default
  682. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  683. -adding changesets
  684. -adding manifests
  685. -adding file changes
  686. -added 7 changesets with 4 changes to 4 files
  687. -(run 'hg update' to get a working copy)
  688. -% 9
  689. -9:e3061ea42e4c
  690. -checking changesets
  691. -checking manifests
  692. -crosschecking files in changesets and manifests
  693. -checking files
  694. -4 files, 10 changesets, 7 total revisions
  695. +
  696. +### Abort: timeout after 180 seconds.
  697. !
  698. ERROR: /home/rupert/hg-crew-10s/tests/test-command-template output changed and returned error code 208
  699. --- /home/rupert/hg-crew-10s/tests/test-command-template.out
  700. +++ /home/rupert/hg-crew-10s/tests/test-command-template.err
  701. -1,1073 +1,2 @@
  702. -created new head
  703. -0 files updated, 0 files merged, 4 files removed, 0 files unresolved
  704. -created new head
  705. -# default style is like normal output
  706. -# normal
  707. -# verbose
  708. -# debug
  709. -# revision with no copies (used to print a traceback)
  710.  
  711. -# compact style works
  712. -8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
  713. - third
  714. -
  715. -7:-1 29114dbae42b 1970-01-12 13:46 +0000 user
  716. - second
  717. -
  718. -6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person
  719. - merge
  720. -
  721. -5:3 13207e5a10d9 1970-01-18 08:40 +0000 person
  722. - new head
  723. -
  724. -4 32a18f097fcc 1970-01-17 04:53 +0000 person
  725. - new branch
  726. -
  727. -3 10e46f2dcbf4 1970-01-16 01:06 +0000 person
  728. - no user, no domain
  729. -
  730. -2 97054abb4ab8 1970-01-14 21:20 +0000 other
  731. - no person
  732. -
  733. -1 b608e9d1a3f0 1970-01-13 17:33 +0000 other
  734. - other 1
  735. -
  736. -0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user
  737. - line 1
  738. -
  739. -8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
  740. - third
  741. -
  742. -7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
  743. - second
  744. -
  745. -6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person
  746. - merge
  747. -
  748. -5:3 13207e5a10d9 1970-01-18 08:40 +0000 person
  749. - new head
  750. -
  751. -4 32a18f097fcc 1970-01-17 04:53 +0000 person
  752. - new branch
  753. -
  754. -3 10e46f2dcbf4 1970-01-16 01:06 +0000 person
  755. - no user, no domain
  756. -
  757. -2 97054abb4ab8 1970-01-14 21:20 +0000 other@place
  758. - no person
  759. -
  760. -1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place>
  761. - other 1
  762. -other 2
  763. -
  764. -other 3
  765. -
  766. -0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname>
  767. - line 1
  768. -line 2
  769. -
  770. -8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test
  771. - third
  772. -
  773. -7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
  774. - second
  775. -
  776. -6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person
  777. - merge
  778. -
  779. -5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person
  780. - new head
  781. -
  782. -4:3,-1 32a18f097fcc 1970-01-17 04:53 +0000 person
  783. - new branch
  784. -
  785. -3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person
  786. - no user, no domain
  787. -
  788. -2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place
  789. - no person
  790. -
  791. -1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place>
  792. - other 1
  793. -other 2
  794. -
  795. -other 3
  796. -
  797. -0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname>
  798. - line 1
  799. -line 2
  800. -
  801. -# xml style works (--style xml)
  802. -<?xml version="1.0"?>
  803. -<log>
  804. -<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
  805. -<tag>tip</tag>
  806. -<author email="test">test</author>
  807. -<date>2020-01-01T10:01:00+00:00</date>
  808. -<msg xml:space="preserve">third</msg>
  809. -</logentry>
  810. -<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
  811. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  812. -<author email="user@hostname">User Name</author>
  813. -<date>1970-01-12T13:46:40+00:00</date>
  814. -<msg xml:space="preserve">second</msg>
  815. -</logentry>
  816. -<logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
  817. -<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
  818. -<parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
  819. -<author email="person">person</author>
  820. -<date>1970-01-18T08:40:01+00:00</date>
  821. -<msg xml:space="preserve">merge</msg>
  822. -</logentry>
  823. -<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
  824. -<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
  825. -<author email="person">person</author>
  826. -<date>1970-01-18T08:40:00+00:00</date>
  827. -<msg xml:space="preserve">new head</msg>
  828. -</logentry>
  829. -<logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
  830. -<branch>foo</branch>
  831. -<author email="person">person</author>
  832. -<date>1970-01-17T04:53:20+00:00</date>
  833. -<msg xml:space="preserve">new branch</msg>
  834. -</logentry>
  835. -<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
  836. -<author email="person">person</author>
  837. -<date>1970-01-16T01:06:40+00:00</date>
  838. -<msg xml:space="preserve">no user, no domain</msg>
  839. -</logentry>
  840. -<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
  841. -<author email="other@place">other</author>
  842. -<date>1970-01-14T21:20:00+00:00</date>
  843. -<msg xml:space="preserve">no person</msg>
  844. -</logentry>
  845. -<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
  846. -<author email="other@place">A. N. Other</author>
  847. -<date>1970-01-13T17:33:20+00:00</date>
  848. -<msg xml:space="preserve">other 1
  849. -other 2
  850. -
  851. -other 3</msg>
  852. -</logentry>
  853. -<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
  854. -<author email="user@hostname">User Name</author>
  855. -<date>1970-01-12T13:46:40+00:00</date>
  856. -<msg xml:space="preserve">line 1
  857. -line 2</msg>
  858. -</logentry>
  859. -</log>
  860. -# xml style works (-v --style xml)
  861. -<?xml version="1.0"?>
  862. -<log>
  863. -<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
  864. -<tag>tip</tag>
  865. -<author email="test">test</author>
  866. -<date>2020-01-01T10:01:00+00:00</date>
  867. -<msg xml:space="preserve">third</msg>
  868. -<paths>
  869. -<path action="A">fourth</path>
  870. -<path action="A">third</path>
  871. -<path action="R">second</path>
  872. -</paths>
  873. -<copies>
  874. -<copy source="second">fourth</copy>
  875. -</copies>
  876. -</logentry>
  877. -<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
  878. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  879. -<author email="user@hostname">User Name</author>
  880. -<date>1970-01-12T13:46:40+00:00</date>
  881. -<msg xml:space="preserve">second</msg>
  882. -<paths>
  883. -<path action="A">second</path>
  884. -</paths>
  885. -</logentry>
  886. -<logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
  887. -<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
  888. -<parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
  889. -<author email="person">person</author>
  890. -<date>1970-01-18T08:40:01+00:00</date>
  891. -<msg xml:space="preserve">merge</msg>
  892. -<paths>
  893. -</paths>
  894. -</logentry>
  895. -<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
  896. -<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
  897. -<author email="person">person</author>
  898. -<date>1970-01-18T08:40:00+00:00</date>
  899. -<msg xml:space="preserve">new head</msg>
  900. -<paths>
  901. -<path action="A">d</path>
  902. -</paths>
  903. -</logentry>
  904. -<logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
  905. -<branch>foo</branch>
  906. -<author email="person">person</author>
  907. -<date>1970-01-17T04:53:20+00:00</date>
  908. -<msg xml:space="preserve">new branch</msg>
  909. -<paths>
  910. -</paths>
  911. -</logentry>
  912. -<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
  913. -<author email="person">person</author>
  914. -<date>1970-01-16T01:06:40+00:00</date>
  915. -<msg xml:space="preserve">no user, no domain</msg>
  916. -<paths>
  917. -<path action="M">c</path>
  918. -</paths>
  919. -</logentry>
  920. -<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
  921. -<author email="other@place">other</author>
  922. -<date>1970-01-14T21:20:00+00:00</date>
  923. -<msg xml:space="preserve">no person</msg>
  924. -<paths>
  925. -<path action="A">c</path>
  926. -</paths>
  927. -</logentry>
  928. -<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
  929. -<author email="other@place">A. N. Other</author>
  930. -<date>1970-01-13T17:33:20+00:00</date>
  931. -<msg xml:space="preserve">other 1
  932. -other 2
  933. -
  934. -other 3</msg>
  935. -<paths>
  936. -<path action="A">b</path>
  937. -</paths>
  938. -</logentry>
  939. -<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
  940. -<author email="user@hostname">User Name</author>
  941. -<date>1970-01-12T13:46:40+00:00</date>
  942. -<msg xml:space="preserve">line 1
  943. -line 2</msg>
  944. -<paths>
  945. -<path action="A">a</path>
  946. -</paths>
  947. -</logentry>
  948. -</log>
  949. -# xml style works (--debug --style xml)
  950. -<?xml version="1.0"?>
  951. -<log>
  952. -<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
  953. -<tag>tip</tag>
  954. -<parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
  955. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  956. -<author email="test">test</author>
  957. -<date>2020-01-01T10:01:00+00:00</date>
  958. -<msg xml:space="preserve">third</msg>
  959. -<paths>
  960. -<path action="A">fourth</path>
  961. -<path action="A">third</path>
  962. -<path action="R">second</path>
  963. -</paths>
  964. -<copies>
  965. -<copy source="second">fourth</copy>
  966. -</copies>
  967. -<extra key="branch">default</extra>
  968. -</logentry>
  969. -<logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
  970. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  971. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  972. -<author email="user@hostname">User Name</author>
  973. -<date>1970-01-12T13:46:40+00:00</date>
  974. -<msg xml:space="preserve">second</msg>
  975. -<paths>
  976. -<path action="A">second</path>
  977. -</paths>
  978. -<extra key="branch">default</extra>
  979. -</logentry>
  980. -<logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
  981. -<parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
  982. -<parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
  983. -<author email="person">person</author>
  984. -<date>1970-01-18T08:40:01+00:00</date>
  985. -<msg xml:space="preserve">merge</msg>
  986. -<paths>
  987. -</paths>
  988. -<extra key="branch">default</extra>
  989. -</logentry>
  990. -<logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
  991. -<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
  992. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  993. -<author email="person">person</author>
  994. -<date>1970-01-18T08:40:00+00:00</date>
  995. -<msg xml:space="preserve">new head</msg>
  996. -<paths>
  997. -<path action="A">d</path>
  998. -</paths>
  999. -<extra key="branch">default</extra>
  1000. -</logentry>
  1001. -<logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
  1002. -<branch>foo</branch>
  1003. -<parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
  1004. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1005. -<author email="person">person</author>
  1006. -<date>1970-01-17T04:53:20+00:00</date>
  1007. -<msg xml:space="preserve">new branch</msg>
  1008. -<paths>
  1009. -</paths>
  1010. -<extra key="branch">foo</extra>
  1011. -</logentry>
  1012. -<logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
  1013. -<parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" />
  1014. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1015. -<author email="person">person</author>
  1016. -<date>1970-01-16T01:06:40+00:00</date>
  1017. -<msg xml:space="preserve">no user, no domain</msg>
  1018. -<paths>
  1019. -<path action="M">c</path>
  1020. -</paths>
  1021. -<extra key="branch">default</extra>
  1022. -</logentry>
  1023. -<logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
  1024. -<parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" />
  1025. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1026. -<author email="other@place">other</author>
  1027. -<date>1970-01-14T21:20:00+00:00</date>
  1028. -<msg xml:space="preserve">no person</msg>
  1029. -<paths>
  1030. -<path action="A">c</path>
  1031. -</paths>
  1032. -<extra key="branch">default</extra>
  1033. -</logentry>
  1034. -<logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
  1035. -<parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" />
  1036. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1037. -<author email="other@place">A. N. Other</author>
  1038. -<date>1970-01-13T17:33:20+00:00</date>
  1039. -<msg xml:space="preserve">other 1
  1040. -other 2
  1041. -
  1042. -other 3</msg>
  1043. -<paths>
  1044. -<path action="A">b</path>
  1045. -</paths>
  1046. -<extra key="branch">default</extra>
  1047. -</logentry>
  1048. -<logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
  1049. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1050. -<parent revision="-1" node="0000000000000000000000000000000000000000" />
  1051. -<author email="user@hostname">User Name</author>
  1052. -<date>1970-01-12T13:46:40+00:00</date>
  1053. -<msg xml:space="preserve">line 1
  1054. -line 2</msg>
  1055. -<paths>
  1056. -<path action="A">a</path>
  1057. -</paths>
  1058. -<extra key="branch">default</extra>
  1059. -</logentry>
  1060. -</log>
  1061. -# error if style not readable
  1062. -abort: Permission denied: ./q
  1063. -# error if no style
  1064. -abort: style not found: notexist
  1065. -# error if style missing key
  1066. -abort: ./t: no key named 'changeset'
  1067. -# error if include fails
  1068. -abort: template file ./q: Permission denied
  1069. -# include works
  1070. -8
  1071. -7
  1072. -6
  1073. -5
  1074. -4
  1075. -3
  1076. -2
  1077. -1
  1078. -0
  1079. -# ui.style works
  1080. -8
  1081. -7
  1082. -6
  1083. -5
  1084. -4
  1085. -3
  1086. -2
  1087. -1
  1088. -0
  1089. -# issue338
  1090. -2020-01-01 test <test>
  1091. -
  1092. - * fourth, second, third:
  1093. - third
  1094. - [95c24699272e] [tip]
  1095. -
  1096. -1970-01-12 User Name <user@hostname>
  1097. -
  1098. - * second:
  1099. - second
  1100. - [29114dbae42b]
  1101. -
  1102. -1970-01-18 person <person>
  1103. -
  1104. - * merge
  1105. - [c7b487c6c50e]
  1106. -
  1107. - * d:
  1108. - new head
  1109. - [13207e5a10d9]
  1110. -
  1111. -1970-01-17 person <person>
  1112. -
  1113. - * new branch
  1114. - [32a18f097fcc] <foo>
  1115. -
  1116. -1970-01-16 person <person>
  1117. -
  1118. - * c:
  1119. - no user, no domain
  1120. - [10e46f2dcbf4]
  1121. -
  1122. -1970-01-14 other <other@place>
  1123. -
  1124. - * c:
  1125. - no person
  1126. - [97054abb4ab8]
  1127. -
  1128. -1970-01-13 A. N. Other <other@place>
  1129. -
  1130. - * b:
  1131. - other 1 other 2
  1132. -
  1133. - other 3
  1134. - [b608e9d1a3f0]
  1135. -
  1136. -1970-01-12 User Name <user@hostname>
  1137. -
  1138. - * a:
  1139. - line 1 line 2
  1140. - [1e4e1b8f71e0]
  1141. -
  1142. -# keys work
  1143. -author: test
  1144. -author: User Name <user@hostname>
  1145. -author: person
  1146. -author: person
  1147. -author: person
  1148. -author: person
  1149. -author: other@place
  1150. -author: A. N. Other <other@place>
  1151. -author: User Name <user@hostname>
  1152. -author--verbose: test
  1153. -author--verbose: User Name <user@hostname>
  1154. -author--verbose: person
  1155. -author--verbose: person
  1156. -author--verbose: person
  1157. -author--verbose: person
  1158. -author--verbose: other@place
  1159. -author--verbose: A. N. Other <other@place>
  1160. -author--verbose: User Name <user@hostname>
  1161. -author--debug: test
  1162. -author--debug: User Name <user@hostname>
  1163. -author--debug: person
  1164. -author--debug: person
  1165. -author--debug: person
  1166. -author--debug: person
  1167. -author--debug: other@place
  1168. -author--debug: A. N. Other <other@place>
  1169. -author--debug: User Name <user@hostname>
  1170. -branches:
  1171. -branches:
  1172. -branches:
  1173. -branches:
  1174. -branches: foo
  1175. -branches:
  1176. -branches:
  1177. -branches:
  1178. -branches:
  1179. -branches--verbose:
  1180. -branches--verbose:
  1181. -branches--verbose:
  1182. -branches--verbose:
  1183. -branches--verbose: foo
  1184. -branches--verbose:
  1185. -branches--verbose:
  1186. -branches--verbose:
  1187. -branches--verbose:
  1188. -branches--debug:
  1189. -branches--debug:
  1190. -branches--debug:
  1191. -branches--debug:
  1192. -branches--debug: foo
  1193. -branches--debug:
  1194. -branches--debug:
  1195. -branches--debug:
  1196. -branches--debug:
  1197. -date: 1577872860.00
  1198. -date: 1000000.00
  1199. -date: 1500001.00
  1200. -date: 1500000.00
  1201. -date: 1400000.00
  1202. -date: 1300000.00
  1203. -date: 1200000.00
  1204. -date: 1100000.00
  1205. -date: 1000000.00
  1206. -date--verbose: 1577872860.00
  1207. -date--verbose: 1000000.00
  1208. -date--verbose: 1500001.00
  1209. -date--verbose: 1500000.00
  1210. -date--verbose: 1400000.00
  1211. -date--verbose: 1300000.00
  1212. -date--verbose: 1200000.00
  1213. -date--verbose: 1100000.00
  1214. -date--verbose: 1000000.00
  1215. -date--debug: 1577872860.00
  1216. -date--debug: 1000000.00
  1217. -date--debug: 1500001.00
  1218. -date--debug: 1500000.00
  1219. -date--debug: 1400000.00
  1220. -date--debug: 1300000.00
  1221. -date--debug: 1200000.00
  1222. -date--debug: 1100000.00
  1223. -date--debug: 1000000.00
  1224. -desc: third
  1225. -desc: second
  1226. -desc: merge
  1227. -desc: new head
  1228. -desc: new branch
  1229. -desc: no user, no domain
  1230. -desc: no person
  1231. -desc: other 1
  1232. -other 2
  1233. -
  1234. -other 3
  1235. -desc: line 1
  1236. -line 2
  1237. -desc--verbose: third
  1238. -desc--verbose: second
  1239. -desc--verbose: merge
  1240. -desc--verbose: new head
  1241. -desc--verbose: new branch
  1242. -desc--verbose: no user, no domain
  1243. -desc--verbose: no person
  1244. -desc--verbose: other 1
  1245. -other 2
  1246. -
  1247. -other 3
  1248. -desc--verbose: line 1
  1249. -line 2
  1250. -desc--debug: third
  1251. -desc--debug: second
  1252. -desc--debug: merge
  1253. -desc--debug: new head
  1254. -desc--debug: new branch
  1255. -desc--debug: no user, no domain
  1256. -desc--debug: no person
  1257. -desc--debug: other 1
  1258. -other 2
  1259. -
  1260. -other 3
  1261. -desc--debug: line 1
  1262. -line 2
  1263. -file_adds: fourth third
  1264. -file_adds: second
  1265. -file_adds:
  1266. -file_adds: d
  1267. -file_adds:
  1268. -file_adds:
  1269. -file_adds: c
  1270. -file_adds: b
  1271. -file_adds: a
  1272. -file_adds--verbose: fourth third
  1273. -file_adds--verbose: second
  1274. -file_adds--verbose:
  1275. -file_adds--verbose: d
  1276. -file_adds--verbose:
  1277. -file_adds--verbose:
  1278. -file_adds--verbose: c
  1279. -file_adds--verbose: b
  1280. -file_adds--verbose: a
  1281. -file_adds--debug: fourth third
  1282. -file_adds--debug: second
  1283. -file_adds--debug:
  1284. -file_adds--debug: d
  1285. -file_adds--debug:
  1286. -file_adds--debug:
  1287. -file_adds--debug: c
  1288. -file_adds--debug: b
  1289. -file_adds--debug: a
  1290. -file_dels: second
  1291. -file_dels:
  1292. -file_dels:
  1293. -file_dels:
  1294. -file_dels:
  1295. -file_dels:
  1296. -file_dels:
  1297. -file_dels:
  1298. -file_dels:
  1299. -file_dels--verbose: second
  1300. -file_dels--verbose:
  1301. -file_dels--verbose:
  1302. -file_dels--verbose:
  1303. -file_dels--verbose:
  1304. -file_dels--verbose:
  1305. -file_dels--verbose:
  1306. -file_dels--verbose:
  1307. -file_dels--verbose:
  1308. -file_dels--debug: second
  1309. -file_dels--debug:
  1310. -file_dels--debug:
  1311. -file_dels--debug:
  1312. -file_dels--debug:
  1313. -file_dels--debug:
  1314. -file_dels--debug:
  1315. -file_dels--debug:
  1316. -file_dels--debug:
  1317. -file_mods:
  1318. -file_mods:
  1319. -file_mods:
  1320. -file_mods:
  1321. -file_mods:
  1322. -file_mods: c
  1323. -file_mods:
  1324. -file_mods:
  1325. -file_mods:
  1326. -file_mods--verbose:
  1327. -file_mods--verbose:
  1328. -file_mods--verbose:
  1329. -file_mods--verbose:
  1330. -file_mods--verbose:
  1331. -file_mods--verbose: c
  1332. -file_mods--verbose:
  1333. -file_mods--verbose:
  1334. -file_mods--verbose:
  1335. -file_mods--debug:
  1336. -file_mods--debug:
  1337. -file_mods--debug:
  1338. -file_mods--debug:
  1339. -file_mods--debug:
  1340. -file_mods--debug: c
  1341. -file_mods--debug:
  1342. -file_mods--debug:
  1343. -file_mods--debug:
  1344. -file_copies: fourth (second)
  1345. -file_copies:
  1346. -file_copies:
  1347. -file_copies:
  1348. -file_copies:
  1349. -file_copies:
  1350. -file_copies:
  1351. -file_copies:
  1352. -file_copies:
  1353. -file_copies--verbose: fourth (second)
  1354. -file_copies--verbose:
  1355. -file_copies--verbose:
  1356. -file_copies--verbose:
  1357. -file_copies--verbose:
  1358. -file_copies--verbose:
  1359. -file_copies--verbose:
  1360. -file_copies--verbose:
  1361. -file_copies--verbose:
  1362. -file_copies--debug: fourth (second)
  1363. -file_copies--debug:
  1364. -file_copies--debug:
  1365. -file_copies--debug:
  1366. -file_copies--debug:
  1367. -file_copies--debug:
  1368. -file_copies--debug:
  1369. -file_copies--debug:
  1370. -file_copies--debug:
  1371. -file_copies_switch:
  1372. -file_copies_switch:
  1373. -file_copies_switch:
  1374. -file_copies_switch:
  1375. -file_copies_switch:
  1376. -file_copies_switch:
  1377. -file_copies_switch:
  1378. -file_copies_switch:
  1379. -file_copies_switch:
  1380. -file_copies_switch--verbose:
  1381. -file_copies_switch--verbose:
  1382. -file_copies_switch--verbose:
  1383. -file_copies_switch--verbose:
  1384. -file_copies_switch--verbose:
  1385. -file_copies_switch--verbose:
  1386. -file_copies_switch--verbose:
  1387. -file_copies_switch--verbose:
  1388. -file_copies_switch--verbose:
  1389. -file_copies_switch--debug:
  1390. -file_copies_switch--debug:
  1391. -file_copies_switch--debug:
  1392. -file_copies_switch--debug:
  1393. -file_copies_switch--debug:
  1394. -file_copies_switch--debug:
  1395. -file_copies_switch--debug:
  1396. -file_copies_switch--debug:
  1397. -file_copies_switch--debug:
  1398. -files: fourth second third
  1399. -files: second
  1400. -files:
  1401. -files: d
  1402. -files:
  1403. -files: c
  1404. -files: c
  1405. -files: b
  1406. -files: a
  1407. -files--verbose: fourth second third
  1408. -files--verbose: second
  1409. -files--verbose:
  1410. -files--verbose: d
  1411. -files--verbose:
  1412. -files--verbose: c
  1413. -files--verbose: c
  1414. -files--verbose: b
  1415. -files--verbose: a
  1416. -files--debug: fourth second third
  1417. -files--debug: second
  1418. -files--debug:
  1419. -files--debug: d
  1420. -files--debug:
  1421. -files--debug: c
  1422. -files--debug: c
  1423. -files--debug: b
  1424. -files--debug: a
  1425. -manifest: 8:94961b75a2da
  1426. -manifest: 7:f2dbc354b94e
  1427. -manifest: 6:91015e9dbdd7
  1428. -manifest: 5:4dc3def4f9b4
  1429. -manifest: 4:90ae8dda64e1
  1430. -manifest: 3:cb5a1327723b
  1431. -manifest: 2:6e0e82995c35
  1432. -manifest: 1:4e8d705b1e53
  1433. -manifest: 0:a0c8bcbbb45c
  1434. -manifest--verbose: 8:94961b75a2da
  1435. -manifest--verbose: 7:f2dbc354b94e
  1436. -manifest--verbose: 6:91015e9dbdd7
  1437. -manifest--verbose: 5:4dc3def4f9b4
  1438. -manifest--verbose: 4:90ae8dda64e1
  1439. -manifest--verbose: 3:cb5a1327723b
  1440. -manifest--verbose: 2:6e0e82995c35
  1441. -manifest--verbose: 1:4e8d705b1e53
  1442. -manifest--verbose: 0:a0c8bcbbb45c
  1443. -manifest--debug: 8:94961b75a2da554b4df6fb599e5bfc7d48de0c64
  1444. -manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
  1445. -manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
  1446. -manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
  1447. -manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363
  1448. -manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
  1449. -manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
  1450. -manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
  1451. -manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
  1452. -node: 95c24699272ef57d062b8bccc32c878bf841784a
  1453. -node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
  1454. -node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
  1455. -node: 13207e5a10d9fd28ec424934298e176197f2c67f
  1456. -node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
  1457. -node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
  1458. -node: 97054abb4ab824450e9164180baf491ae0078465
  1459. -node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
  1460. -node: 1e4e1b8f71e05681d422154f5421e385fec3454f
  1461. -node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
  1462. -node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
  1463. -node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
  1464. -node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
  1465. -node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
  1466. -node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
  1467. -node--verbose: 97054abb4ab824450e9164180baf491ae0078465
  1468. -node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
  1469. -node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
  1470. -node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
  1471. -node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
  1472. -node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
  1473. -node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
  1474. -node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
  1475. -node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
  1476. -node--debug: 97054abb4ab824450e9164180baf491ae0078465
  1477. -node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
  1478. -node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
  1479. -parents:
  1480. -parents: -1:000000000000
  1481. -parents: 5:13207e5a10d9 4:32a18f097fcc
  1482. -parents: 3:10e46f2dcbf4
  1483. -parents:
  1484. -parents:
  1485. -parents:
  1486. -parents:
  1487. -parents:
  1488. -parents--verbose:
  1489. -parents--verbose: -1:000000000000
  1490. -parents--verbose: 5:13207e5a10d9 4:32a18f097fcc
  1491. -parents--verbose: 3:10e46f2dcbf4
  1492. -parents--verbose:
  1493. -parents--verbose:
  1494. -parents--verbose:
  1495. -parents--verbose:
  1496. -parents--verbose:
  1497. -parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000
  1498. -parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
  1499. -parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4
  1500. -parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
  1501. -parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000
  1502. -parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000
  1503. -parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000
  1504. -parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000
  1505. -parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000
  1506. -rev: 8
  1507. -rev: 7
  1508. -rev: 6
  1509. -rev: 5
  1510. -rev: 4
  1511. -rev: 3
  1512. -rev: 2
  1513. -rev: 1
  1514. -rev: 0
  1515. -rev--verbose: 8
  1516. -rev--verbose: 7
  1517. -rev--verbose: 6
  1518. -rev--verbose: 5
  1519. -rev--verbose: 4
  1520. -rev--verbose: 3
  1521. -rev--verbose: 2
  1522. -rev--verbose: 1
  1523. -rev--verbose: 0
  1524. -rev--debug: 8
  1525. -rev--debug: 7
  1526. -rev--debug: 6
  1527. -rev--debug: 5
  1528. -rev--debug: 4
  1529. -rev--debug: 3
  1530. -rev--debug: 2
  1531. -rev--debug: 1
  1532. -rev--debug: 0
  1533. -tags: tip
  1534. -tags:
  1535. -tags:
  1536. -tags:
  1537. -tags:
  1538. -tags:
  1539. -tags:
  1540. -tags:
  1541. -tags:
  1542. -tags--verbose: tip
  1543. -tags--verbose:
  1544. -tags--verbose:
  1545. -tags--verbose:
  1546. -tags--verbose:
  1547. -tags--verbose:
  1548. -tags--verbose:
  1549. -tags--verbose:
  1550. -tags--verbose:
  1551. -tags--debug: tip
  1552. -tags--debug:
  1553. -tags--debug:
  1554. -tags--debug:
  1555. -tags--debug:
  1556. -tags--debug:
  1557. -tags--debug:
  1558. -tags--debug:
  1559. -tags--debug:
  1560. -diffstat: 3: +2/-1
  1561. -diffstat: 1: +1/-0
  1562. -diffstat: 0: +0/-0
  1563. -diffstat: 1: +1/-0
  1564. -diffstat: 0: +0/-0
  1565. -diffstat: 1: +1/-0
  1566. -diffstat: 1: +4/-0
  1567. -diffstat: 1: +2/-0
  1568. -diffstat: 1: +1/-0
  1569. -diffstat--verbose: 3: +2/-1
  1570. -diffstat--verbose: 1: +1/-0
  1571. -diffstat--verbose: 0: +0/-0
  1572. -diffstat--verbose: 1: +1/-0
  1573. -diffstat--verbose: 0: +0/-0
  1574. -diffstat--verbose: 1: +1/-0
  1575. -diffstat--verbose: 1: +4/-0
  1576. -diffstat--verbose: 1: +2/-0
  1577. -diffstat--verbose: 1: +1/-0
  1578. -diffstat--debug: 3: +2/-1
  1579. -diffstat--debug: 1: +1/-0
  1580. -diffstat--debug: 0: +0/-0
  1581. -diffstat--debug: 1: +1/-0
  1582. -diffstat--debug: 0: +0/-0
  1583. -diffstat--debug: 1: +1/-0
  1584. -diffstat--debug: 1: +4/-0
  1585. -diffstat--debug: 1: +2/-0
  1586. -diffstat--debug: 1: +1/-0
  1587. -extras: branch=default
  1588. -extras: branch=default
  1589. -extras: branch=default
  1590. -extras: branch=default
  1591. -extras: branch=foo
  1592. -extras: branch=default
  1593. -extras: branch=default
  1594. -extras: branch=default
  1595. -extras: branch=default
  1596. -extras--verbose: branch=default
  1597. -extras--verbose: branch=default
  1598. -extras--verbose: branch=default
  1599. -extras--verbose: branch=default
  1600. -extras--verbose: branch=foo
  1601. -extras--verbose: branch=default
  1602. -extras--verbose: branch=default
  1603. -extras--verbose: branch=default
  1604. -extras--verbose: branch=default
  1605. -extras--debug: branch=default
  1606. -extras--debug: branch=default
  1607. -extras--debug: branch=default
  1608. -extras--debug: branch=default
  1609. -extras--debug: branch=foo
  1610. -extras--debug: branch=default
  1611. -extras--debug: branch=default
  1612. -extras--debug: branch=default
  1613. -extras--debug: branch=default
  1614. -# filters work
  1615. -
  1616. -hostname
  1617. -
  1618. -
  1619. -
  1620. -
  1621. -place
  1622. -place
  1623. -hostname
  1624. -test
  1625. -User Name
  1626. -person
  1627. -person
  1628. -person
  1629. -person
  1630. -other
  1631. -A. N. Other
  1632. -User Name
  1633. -test
  1634. -user
  1635. -person
  1636. -person
  1637. -person
  1638. -person
  1639. -other
  1640. -other
  1641. -user
  1642. -in the future
  1643. -Wed Jan 01 10:01:00 2020 +0000
  1644. -Mon Jan 12 13:46:40 1970 +0000
  1645. -Sun Jan 18 08:40:01 1970 +0000
  1646. -Sun Jan 18 08:40:00 1970 +0000
  1647. -Sat Jan 17 04:53:20 1970 +0000
  1648. -Fri Jan 16 01:06:40 1970 +0000
  1649. -Wed Jan 14 21:20:00 1970 +0000
  1650. -Tue Jan 13 17:33:20 1970 +0000
  1651. -Mon Jan 12 13:46:40 1970 +0000
  1652. -2020-01-01 10:01 +0000
  1653. -1970-01-12 13:46 +0000
  1654. -1970-01-18 08:40 +0000
  1655. -1970-01-18 08:40 +0000
  1656. -1970-01-17 04:53 +0000
  1657. -1970-01-16 01:06 +0000
  1658. -1970-01-14 21:20 +0000
  1659. -1970-01-13 17:33 +0000
  1660. -1970-01-12 13:46 +0000
  1661. -2020-01-01 10:01:00 +0000
  1662. -1970-01-12 13:46:40 +0000
  1663. -1970-01-18 08:40:01 +0000
  1664. -1970-01-18 08:40:00 +0000
  1665. -1970-01-17 04:53:20 +0000
  1666. -1970-01-16 01:06:40 +0000
  1667. -1970-01-14 21:20:00 +0000
  1668. -1970-01-13 17:33:20 +0000
  1669. -1970-01-12 13:46:40 +0000
  1670. -Wed, 01 Jan 2020 10:01:00 +0000
  1671. -Mon, 12 Jan 1970 13:46:40 +0000
  1672. -Sun, 18 Jan 1970 08:40:01 +0000
  1673. -Sun, 18 Jan 1970 08:40:00 +0000
  1674. -Sat, 17 Jan 1970 04:53:20 +0000
  1675. -Fri, 16 Jan 1970 01:06:40 +0000
  1676. -Wed, 14 Jan 1970 21:20:00 +0000
  1677. -Tue, 13 Jan 1970 17:33:20 +0000
  1678. -Mon, 12 Jan 1970 13:46:40 +0000
  1679. -third
  1680. -second
  1681. -merge
  1682. -new head
  1683. -new branch
  1684. -no user, no domain
  1685. -no person
  1686. -other 1
  1687. -line 1
  1688. -95c24699272e
  1689. -29114dbae42b
  1690. -c7b487c6c50e
  1691. -13207e5a10d9
  1692. -32a18f097fcc
  1693. -10e46f2dcbf4
  1694. -97054abb4ab8
  1695. -b608e9d1a3f0
  1696. -1e4e1b8f71e0
  1697. -<changeset author="test"/>
  1698. -<changeset author="User Name <user@hostname>"/>
  1699. -<changeset author="person"/>
  1700. -<changeset author="person"/>
  1701. -<changeset author="person"/>
  1702. -<changeset author="person"/>
  1703. -<changeset author="other@place"/>
  1704. -<changeset author="A. N. Other <other@place>"/>
  1705. -<changeset author="User Name <user@hostname>"/>
  1706. -# formatnode filter works
  1707. -# quiet
  1708. -1e4e1b8f71e0
  1709. -# normal
  1710. -1e4e1b8f71e0
  1711. -# verbose
  1712. -1e4e1b8f71e0
  1713. -# debug
  1714. -1e4e1b8f71e05681d422154f5421e385fec3454f
  1715. -# error on syntax
  1716. -abort: t:3: unmatched quotes
  1717. -# latesttag
  1718. -adding file
  1719. -adding head1
  1720. -adding head2
  1721. -created new head
  1722. -# No tag set
  1723. -5: null+5
  1724. -4: null+4
  1725. -3: null+3
  1726. -2: null+3
  1727. -1: null+2
  1728. -0: null+1
  1729. -# one common tag: longuest path wins
  1730. -6: t1+4
  1731. -5: t1+3
  1732. -4: t1+2
  1733. -3: t1+1
  1734. -2: t1+1
  1735. -1: t1+0
  1736. -0: null+1
  1737. -# one ancestor tag: more recent wins
  1738. -7: t2+3
  1739. -6: t2+2
  1740. -5: t2+1
  1741. -4: t1+2
  1742. -3: t1+1
  1743. -2: t2+0
  1744. -1: t1+0
  1745. -0: null+1
  1746. -# two branch tags: more recent wins
  1747. -8: t3+5
  1748. -7: t3+4
  1749. -6: t3+3
  1750. -5: t3+2
  1751. -4: t3+1
  1752. -3: t3+0
  1753. -2: t2+0
  1754. -1: t1+0
  1755. -0: null+1
  1756. -# merged tag overrides
  1757. -10: t5+5
  1758. -9: t5+4
  1759. -8: t5+3
  1760. -7: t5+2
  1761. -6: t5+1
  1762. -5: t5+0
  1763. -4: at3:t3+1
  1764. -3: at3:t3+0
  1765. -2: t2+0
  1766. -1: t1+0
  1767. -0: null+1
  1768. -# style path expansion (issue1948)
  1769. -test 10:dee8f28249af
  1770. -# test recursive showlist template (issue1989)
  1771. -M|test
  1772. -10,test
  1773. -branch: test
  1774. -# done
  1775. +### Abort: timeout after 180 seconds.
  1776. !..........................s..s.........................s..........s.............
  1777. ERROR: /home/rupert/hg-crew-10s/tests/test-import output changed and returned error code 208
  1778. --- /home/rupert/hg-crew-10s/tests/test-import.out
  1779. +++ /home/rupert/hg-crew-10s/tests/test-import.err
  1780. -1,337 +1,2 @@
  1781. -adding a
  1782. -adding d1/d2/a
  1783. -% import exported patch
  1784. -requesting all changes
  1785. -adding changesets
  1786. -adding manifests
  1787. -adding file changes
  1788. -added 1 changesets with 2 changes to 2 files
  1789. -updating to branch default
  1790. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1791. -applying ../tip.patch
  1792. -% message should be same
  1793. -summary: second change
  1794. -% committer should be same
  1795. -user: someone
  1796. -% import exported patch with external patcher
  1797. -requesting all changes
  1798. -adding changesets
  1799. -adding manifests
  1800. -adding file changes
  1801. -added 1 changesets with 2 changes to 2 files
  1802. -updating to branch default
  1803. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1804. -applying ../tip.patch
  1805. -line2
  1806. -% import of plain diff should fail without message
  1807. -requesting all changes
  1808. -adding changesets
  1809. -adding manifests
  1810. -adding file changes
  1811. -added 1 changesets with 2 changes to 2 files
  1812. -updating to branch default
  1813. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1814. -applying ../tip.patch
  1815. -abort: empty commit message
  1816. -% import of plain diff should be ok with message
  1817. -requesting all changes
  1818. -adding changesets
  1819. -adding manifests
  1820. -adding file changes
  1821. -added 1 changesets with 2 changes to 2 files
  1822. -updating to branch default
  1823. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1824. -applying ../tip.patch
  1825. -% import of plain diff with specific date and user
  1826. -requesting all changes
  1827. -adding changesets
  1828. -adding manifests
  1829. -adding file changes
  1830. -added 1 changesets with 2 changes to 2 files
  1831. -updating to branch default
  1832. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1833. -applying ../tip.patch
  1834. -changeset: 1:ca68f19f3a40
  1835. -tag: tip
  1836. -user: user@nowhere.net
  1837. -date: Thu Jan 01 00:00:01 1970 +0000
  1838. -files: a
  1839. -description:
  1840. -patch
  1841.  
  1842. -
  1843. -diff -r 80971e65b431 -r ca68f19f3a40 a
  1844. ---- a/a Thu Jan 01 00:00:00 1970 +0000
  1845. -+++ b/a Thu Jan 01 00:00:01 1970 +0000
  1846. -@@ -1,1 +1,2 @@
  1847. - line 1
  1848. -+line 2
  1849. -
  1850. -% import of plain diff should be ok with --no-commit
  1851. -requesting all changes
  1852. -adding changesets
  1853. -adding manifests
  1854. -adding file changes
  1855. -added 1 changesets with 2 changes to 2 files
  1856. -updating to branch default
  1857. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1858. -applying ../tip.patch
  1859. -diff -r 80971e65b431 a
  1860. ---- a/a
  1861. -+++ b/a
  1862. -@@ -1,1 +1,2 @@
  1863. - line 1
  1864. -+line 2
  1865. -% hg -R repo import
  1866. -requesting all changes
  1867. -adding changesets
  1868. -adding manifests
  1869. -adding file changes
  1870. -added 1 changesets with 2 changes to 2 files
  1871. -updating to branch default
  1872. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1873. -applying tip.patch
  1874. -% import from stdin
  1875. -requesting all changes
  1876. -adding changesets
  1877. -adding manifests
  1878. -adding file changes
  1879. -added 1 changesets with 2 changes to 2 files
  1880. -updating to branch default
  1881. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1882. -applying patch from stdin
  1883. -% import two patches in one stream
  1884. -applying patch from stdin
  1885. -applied 80971e65b431
  1886. -1d4bd90af0e4 tip
  1887. -1d4bd90af0e4 tip
  1888. -% override commit message
  1889. -requesting all changes
  1890. -adding changesets
  1891. -adding manifests
  1892. -adding file changes
  1893. -added 1 changesets with 2 changes to 2 files
  1894. -updating to branch default
  1895. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1896. -applying patch from stdin
  1897. -summary: override
  1898. -% plain diff in email, subject, message body
  1899. -requesting all changes
  1900. -adding changesets
  1901. -adding manifests
  1902. -adding file changes
  1903. -added 1 changesets with 2 changes to 2 files
  1904. -updating to branch default
  1905. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1906. -applying ../msg.patch
  1907. -user: email patcher
  1908. -summary: email patch
  1909. -% plain diff in email, no subject, message body
  1910. -requesting all changes
  1911. -adding changesets
  1912. -adding manifests
  1913. -adding file changes
  1914. -added 1 changesets with 2 changes to 2 files
  1915. -updating to branch default
  1916. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1917. -applying patch from stdin
  1918. -% plain diff in email, subject, no message body
  1919. -requesting all changes
  1920. -adding changesets
  1921. -adding manifests
  1922. -adding file changes
  1923. -added 1 changesets with 2 changes to 2 files
  1924. -updating to branch default
  1925. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1926. -applying patch from stdin
  1927. -% plain diff in email, no subject, no message body, should fail
  1928. -requesting all changes
  1929. -adding changesets
  1930. -adding manifests
  1931. -adding file changes
  1932. -added 1 changesets with 2 changes to 2 files
  1933. -updating to branch default
  1934. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1935. -applying patch from stdin
  1936. -abort: empty commit message
  1937. -% hg export in email, should use patch header
  1938. -requesting all changes
  1939. -adding changesets
  1940. -adding manifests
  1941. -adding file changes
  1942. -added 1 changesets with 2 changes to 2 files
  1943. -updating to branch default
  1944. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1945. -applying patch from stdin
  1946. -summary: second change
  1947. -% plain diff in email, [PATCH] subject, message body with subject
  1948. -requesting all changes
  1949. -adding changesets
  1950. -adding manifests
  1951. -adding file changes
  1952. -added 1 changesets with 2 changes to 2 files
  1953. -updating to branch default
  1954. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1955. -applying patch from stdin
  1956. -email patch
  1957. -
  1958. -next line
  1959. ----
  1960. -% import patch1 patch2; rollback
  1961. -parent: 0
  1962. -applying ../patch1
  1963. -applying ../patch2
  1964. -applied 1d4bd90af0e4
  1965. -rolling back last transaction
  1966. -parent: 1
  1967. -% hg import in a subdirectory
  1968. -requesting all changes
  1969. -adding changesets
  1970. -adding manifests
  1971. -adding file changes
  1972. -added 1 changesets with 2 changes to 2 files
  1973. -updating to branch default
  1974. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1975. -applying ../../../tip.patch
  1976. -% message should be 'subdir change'
  1977. -summary: subdir change
  1978. -% committer should be 'someoneelse'
  1979. -user: someoneelse
  1980. -% should be empty
  1981. -% test fuzziness
  1982. -adding a
  1983. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1984. -created new head
  1985. -applying tip.patch
  1986. -patching file a
  1987. -Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
  1988. -reverting a
  1989. -% test fuzziness with eol=auto
  1990. -applying tip.patch
  1991. -patching file a
  1992. -Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
  1993. -adding a
  1994. -adding b1
  1995. -adding c1
  1996. -adding d
  1997. -diff --git a/a b/a
  1998. ---- a/a
  1999. -+++ b/a
  2000. -@@ -0,0 +1,1 @@
  2001. -+a
  2002. -diff --git a/b1 b/b2
  2003. -rename from b1
  2004. -rename to b2
  2005. ---- a/b1
  2006. -+++ b/b2
  2007. -@@ -0,0 +1,1 @@
  2008. -+b
  2009. -diff --git a/c1 b/c1
  2010. ---- a/c1
  2011. -+++ b/c1
  2012. -@@ -0,0 +1,1 @@
  2013. -+c
  2014. -diff --git a/c1 b/c2
  2015. -copy from c1
  2016. -copy to c2
  2017. ---- a/c1
  2018. -+++ b/c2
  2019. -@@ -0,0 +1,1 @@
  2020. -+c
  2021. -diff --git a/d b/d
  2022. ---- a/d
  2023. -+++ b/d
  2024. -@@ -1,1 +0,0 @@
  2025. --d
  2026. -4 files updated, 0 files merged, 2 files removed, 0 files unresolved
  2027. -applying empty.diff
  2028. -% a file
  2029. -a
  2030. -% b1 file
  2031. -% b2 file
  2032. -b
  2033. -% c1 file
  2034. -c
  2035. -% c2 file
  2036. -c
  2037. -% d file
  2038. -% test trailing binary removal
  2039. -adding a
  2040. -adding b
  2041. -R a
  2042. -R b
  2043. -diff --git a/a b/a
  2044. -diff --git a/b b/b
  2045. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  2046. -applying remove.diff
  2047. -% test update+rename with common name (issue 927)
  2048. -adding a
  2049. -1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  2050. -applying copy.diff
  2051. -% view a
  2052. -a
  2053. -% view a2
  2054. -a
  2055. -% test -p0
  2056. -adding a
  2057. -applying patch from stdin
  2058. -bb
  2059. -% test paths outside repo root
  2060. -applying patch from stdin
  2061. -abort: ../outside/foo not under root
  2062. -% test import with similarity (issue295)
  2063. -adding a
  2064. -applying ../rename.diff
  2065. -patching file a
  2066. -patching file b
  2067. -removing a
  2068. -adding b
  2069. -recording removal of a as rename to b (88% similar)
  2070. -A b
  2071. - a
  2072. -R a
  2073. -undeleting a
  2074. -forgetting b
  2075. -applying ../rename.diff
  2076. -patching file a
  2077. -patching file b
  2078. -removing a
  2079. -adding b
  2080. -A b
  2081. -R a
  2082. -% add empty file from the end of patch (issue 1495)
  2083. -adding a
  2084. -applying a.patch
  2085. -% create file when source is not /dev/null
  2086. -applying ../create.patch
  2087. -a
  2088. -% first line mistaken for email headers (issue 1859)
  2089. -applying a.patch
  2090. -changeset: 0:5a681217c0ad
  2091. -tag: tip
  2092. -user: test
  2093. -date: Thu Jan 01 00:00:00 1970 +0000
  2094. -files: a
  2095. -description:
  2096. -module: summary
  2097. -
  2098. -description
  2099. -
  2100. -
  2101. -% tricky header splitting
  2102. -applying ../trickyheaders.patch
  2103. -# HG changeset patch
  2104. -# User User B
  2105. -# Date 0 0
  2106. -# Node ID eb56ab91903632294ac504838508cb370c0901d2
  2107. -# Parent 0000000000000000000000000000000000000000
  2108. -from: tricky!
  2109. -
  2110. -That is not a header.
  2111. -
  2112. -diff --git a/foo b/foo
  2113. -new file mode 100644
  2114. ---- /dev/null
  2115. -+++ b/foo
  2116. -@@ -0,0 +1,1 @@
  2117. -+foo
  2118. +### Abort: timeout after 180 seconds.
  2119. !...s.....................ss..........s.........
  2120. ERROR: /home/rupert/hg-crew-10s/tests/test-merge-default output changed and returned error code 1
  2121. --- /home/rupert/hg-crew-10s/tests/test-merge-default.out
  2122. +++ /home/rupert/hg-crew-10s/tests/test-merge-default.err
  2123. -9,33 +9,4 @@
  2124. (run 'hg heads .' to see heads)
  2125. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  2126. % should fail because > 2 heads
  2127. -abort: branch 'default' has 3 heads - please merge with an explicit rev
  2128. -(run 'hg heads .' to see heads)
  2129. -% should succeed
  2130. -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  2131. -(branch merge, don't forget to commit)
  2132. -% should succeed - 2 heads
  2133. -changeset: 3:ea9ff125ff88
  2134. -parent: 1:1846eede8b68
  2135. -user: test
  2136. -date: Thu Jan 01 00:00:00 1970 +0000
  2137. -summary: d
  2138. -
  2139. -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  2140. -(branch merge, don't forget to commit)
  2141. -% should fail because at tip
  2142. -abort: there is nothing to merge
  2143. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  2144. -% should fail because 1 head
  2145. -abort: there is nothing to merge - use "hg update" instead
  2146. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  2147. -marked working directory as branch foobranch
  2148. -created new head
  2149. -% should fail because merge with other branch
  2150. -abort: branch 'foobranch' has one head - please merge with an explicit rev
  2151. -(run 'hg heads' to see all heads)
  2152. -% merge preview not affected by common ancestor
  2153. -2:2d95304fed5d
  2154. -4:f25cbe84d8b3
  2155. -5:a431fabd6039
  2156. -6:e88e33f3bf62
  2157. +/home/rupert/hg-crew-10s/tests/test-merge-default: HGMERGE=internal:other: is not an identifier
  2158. !........
  2159. ERROR: /home/rupert/hg-crew-10s/tests/test-mq-header-from output changed and returned error code 208
  2160. --- /home/rupert/hg-crew-10s/tests/test-mq-header-from.out
  2161. +++ /home/rupert/hg-crew-10s/tests/test-mq-header-from.err
  2162. -1,829 +1,2 @@
  2163. -======= plain headers
  2164. -==== init
  2165. -==== qnew -U
  2166. -From: test
  2167.  
  2168. -0: [mq]: 1.patch - test
  2169. -==== qref
  2170. -adding 1
  2171. -From: test
  2172. -
  2173. -diff -r ... 1
  2174. ---- /dev/null
  2175. -+++ b/1
  2176. -@@ -0,0 +1,1 @@
  2177. -+1
  2178. -0: [mq]: 1.patch - test
  2179. -==== qref -u
  2180. -From: mary
  2181. -
  2182. -diff -r ... 1
  2183. ---- /dev/null
  2184. -+++ b/1
  2185. -@@ -0,0 +1,1 @@
  2186. -+1
  2187. -0: [mq]: 1.patch - mary
  2188. -==== qnew
  2189. -adding 2
  2190. -diff -r ... 2
  2191. ---- /dev/null
  2192. -+++ b/2
  2193. -@@ -0,0 +1,1 @@
  2194. -+2
  2195. -1: [mq]: 2.patch - test
  2196. -0: [mq]: 1.patch - mary
  2197. -==== qref -u
  2198. -From: jane
  2199. -
  2200. -diff -r ... 2
  2201. ---- /dev/null
  2202. -+++ b/2
  2203. -@@ -0,0 +1,1 @@
  2204. -+2
  2205. -1: [mq]: 2.patch - jane
  2206. -0: [mq]: 1.patch - mary
  2207. -==== qnew -U -m
  2208. -From: test
  2209. -
  2210. -Three
  2211. -
  2212. -2: Three - test
  2213. -1: [mq]: 2.patch - jane
  2214. -0: [mq]: 1.patch - mary
  2215. -==== qref
  2216. -adding 3
  2217. -From: test
  2218. -
  2219. -Three
  2220. -
  2221. -diff -r ... 3
  2222. ---- /dev/null
  2223. -+++ b/3
  2224. -@@ -0,0 +1,1 @@
  2225. -+3
  2226. -2: Three - test
  2227. -1: [mq]: 2.patch - jane
  2228. -0: [mq]: 1.patch - mary
  2229. -==== qref -m
  2230. -From: test
  2231. -
  2232. -Drei
  2233. -
  2234. -diff -r ... 3
  2235. ---- /dev/null
  2236. -+++ b/3
  2237. -@@ -0,0 +1,1 @@
  2238. -+3
  2239. -2: Drei - test
  2240. -1: [mq]: 2.patch - jane
  2241. -0: [mq]: 1.patch - mary
  2242. -==== qref -u
  2243. -From: mary
  2244. -
  2245. -Drei
  2246. -
  2247. -diff -r ... 3
  2248. ---- /dev/null
  2249. -+++ b/3
  2250. -@@ -0,0 +1,1 @@
  2251. -+3
  2252. -2: Drei - mary
  2253. -1: [mq]: 2.patch - jane
  2254. -0: [mq]: 1.patch - mary
  2255. -==== qref -u -m
  2256. -From: maria
  2257. -
  2258. -Three (again)
  2259. -
  2260. -diff -r ... 3
  2261. ---- /dev/null
  2262. -+++ b/3
  2263. -@@ -0,0 +1,1 @@
  2264. -+3
  2265. -2: Three (again) - maria
  2266. -1: [mq]: 2.patch - jane
  2267. -0: [mq]: 1.patch - mary
  2268. -==== qnew -m
  2269. -adding 4of
  2270. -Four
  2271. -
  2272. -diff -r ... 4of
  2273. ---- /dev/null
  2274. -+++ b/4of
  2275. -@@ -0,0 +1,1 @@
  2276. -+4 t
  2277. -3: Four - test
  2278. -2: Three (again) - maria
  2279. -1: [mq]: 2.patch - jane
  2280. -0: [mq]: 1.patch - mary
  2281. -==== qref -u
  2282. -From: jane
  2283. -Four
  2284. -
  2285. -diff -r ... 4of
  2286. ---- /dev/null
  2287. -+++ b/4of
  2288. -@@ -0,0 +1,1 @@
  2289. -+4 t
  2290. -3: Four - jane
  2291. -2: Three (again) - maria
  2292. -1: [mq]: 2.patch - jane
  2293. -0: [mq]: 1.patch - mary
  2294. -==== qnew with HG header
  2295. -popping 5.patch
  2296. -now at: 4.patch
  2297. -now at: 5.patch
  2298. -# HG changeset patch
  2299. -# User johndoe
  2300. -4: imported patch 5.patch - johndoe
  2301. -3: Four - jane
  2302. -2: Three (again) - maria
  2303. -1: [mq]: 2.patch - jane
  2304. -0: [mq]: 1.patch - mary
  2305. -==== hg qref
  2306. -adding 5
  2307. -# HG changeset patch
  2308. -# Parent
  2309. -# User johndoe
  2310. -
  2311. -diff -r ... 5
  2312. ---- /dev/null
  2313. -+++ b/5
  2314. -@@ -0,0 +1,1 @@
  2315. -+5
  2316. -4: [mq]: 5.patch - johndoe
  2317. -3: Four - jane
  2318. -2: Three (again) - maria
  2319. -1: [mq]: 2.patch - jane
  2320. -0: [mq]: 1.patch - mary
  2321. -==== hg qref -U
  2322. -# HG changeset patch
  2323. -# Parent
  2324. -# User test
  2325. -
  2326. -diff -r ... 5
  2327. ---- /dev/null
  2328. -+++ b/5
  2329. -@@ -0,0 +1,1 @@
  2330. -+5
  2331. -4: [mq]: 5.patch - test
  2332. -3: Four - jane
  2333. -2: Three (again) - maria
  2334. -1: [mq]: 2.patch - jane
  2335. -0: [mq]: 1.patch - mary
  2336. -==== hg qref -u
  2337. -# HG changeset patch
  2338. -# Parent
  2339. -# User johndeere
  2340. -
  2341. -diff -r ... 5
  2342. ---- /dev/null
  2343. -+++ b/5
  2344. -@@ -0,0 +1,1 @@
  2345. -+5
  2346. -4: [mq]: 5.patch - johndeere
  2347. -3: Four - jane
  2348. -2: Three (again) - maria
  2349. -1: [mq]: 2.patch - jane
  2350. -0: [mq]: 1.patch - mary
  2351. -==== qnew with plain header
  2352. -popping 6.patch
  2353. -now at: 5.patch
  2354. -now at: 6.patch
  2355. -From: test
  2356. -
  2357. -5: imported patch 6.patch - test
  2358. -4: [mq]: 5.patch - johndeere
  2359. -3: Four - jane
  2360. -2: Three (again) - maria
  2361. -1: [mq]: 2.patch - jane
  2362. -0: [mq]: 1.patch - mary
  2363. -==== hg qref
  2364. -adding 6
  2365. -From: test
  2366. -
  2367. -diff -r ... 6
  2368. ---- /dev/null
  2369. -+++ b/6
  2370. -@@ -0,0 +1,1 @@
  2371. -+6
  2372. -5: [mq]: 6.patch - test
  2373. -4: [mq]: 5.patch - johndeere
  2374. -3: Four - jane
  2375. -2: Three (again) - maria
  2376. -1: [mq]: 2.patch - jane
  2377. -0: [mq]: 1.patch - mary
  2378. -==== hg qref -U
  2379. -From: test
  2380. -
  2381. -diff -r ... 6
  2382. ---- /dev/null
  2383. -+++ b/6
  2384. -@@ -0,0 +1,1 @@
  2385. -+6
  2386. -5: [mq]: 6.patch - test
  2387. -4: [mq]: 5.patch - johndeere
  2388. -3: Four - jane
  2389. -2: Three (again) - maria
  2390. -1: [mq]: 2.patch - jane
  2391. -0: [mq]: 1.patch - mary
  2392. -==== hg qref -u
  2393. -From: johndeere
  2394. -
  2395. -diff -r ... 6
  2396. ---- /dev/null
  2397. -+++ b/6
  2398. -@@ -0,0 +1,1 @@
  2399. -+6
  2400. -5: [mq]: 6.patch - johndeere
  2401. -4: [mq]: 5.patch - johndeere
  2402. -3: Four - jane
  2403. -2: Three (again) - maria
  2404. -1: [mq]: 2.patch - jane
  2405. -0: [mq]: 1.patch - mary
  2406. -==== qpop -a / qpush -a
  2407. -popping 6.patch
  2408. -popping 5.patch
  2409. -popping 4.patch
  2410. -popping 3.patch
  2411. -popping 2.patch
  2412. -popping 1.patch
  2413. -patch queue now empty
  2414. -applying 1.patch
  2415. -applying 2.patch
  2416. -applying 3.patch
  2417. -applying 4.patch
  2418. -applying 5.patch
  2419. -applying 6.patch
  2420. -now at: 6.patch
  2421. -5: imported patch 6.patch - johndeere
  2422. -4: imported patch 5.patch - johndeere
  2423. -3: Four - jane
  2424. -2: Three (again) - maria
  2425. -1: imported patch 2.patch - jane
  2426. -0: imported patch 1.patch - mary
  2427. -======= hg headers
  2428. -==== init
  2429. -==== qnew -U
  2430. -# HG changeset patch
  2431. -# Parent
  2432. -# User test
  2433. -0: [mq]: 1.patch - test
  2434. -==== qref
  2435. -adding 1
  2436. -# HG changeset patch
  2437. -# Parent
  2438. -# User test
  2439. -
  2440. -diff -r ... 1
  2441. ---- /dev/null
  2442. -+++ b/1
  2443. -@@ -0,0 +1,1 @@
  2444. -+1
  2445. -0: [mq]: 1.patch - test
  2446. -==== qref -u
  2447. -# HG changeset patch
  2448. -# Parent
  2449. -# User mary
  2450. -
  2451. -diff -r ... 1
  2452. ---- /dev/null
  2453. -+++ b/1
  2454. -@@ -0,0 +1,1 @@
  2455. -+1
  2456. -0: [mq]: 1.patch - mary
  2457. -==== qnew
  2458. -adding 2
  2459. -# HG changeset patch
  2460. -# Parent
  2461. -
  2462. -diff -r ... 2
  2463. ---- /dev/null
  2464. -+++ b/2
  2465. -@@ -0,0 +1,1 @@
  2466. -+2
  2467. -1: [mq]: 2.patch - test
  2468. -0: [mq]: 1.patch - mary
  2469. -==== qref -u
  2470. -# HG changeset patch
  2471. -# User jane
  2472. -# Parent
  2473. -
  2474. -diff -r ... 2
  2475. ---- /dev/null
  2476. -+++ b/2
  2477. -@@ -0,0 +1,1 @@
  2478. -+2
  2479. -1: [mq]: 2.patch - jane
  2480. -0: [mq]: 1.patch - mary
  2481. -==== qnew -U -m
  2482. -# HG changeset patch
  2483. -# Parent
  2484. -# User test
  2485. -Three
  2486. -
  2487. -2: Three - test
  2488. -1: [mq]: 2.patch - jane
  2489. -0: [mq]: 1.patch - mary
  2490. -==== qref
  2491. -adding 3
  2492. -# HG changeset patch
  2493. -# Parent
  2494. -# User test
  2495. -Three
  2496. -
  2497. -diff -r ... 3
  2498. ---- /dev/null
  2499. -+++ b/3
  2500. -@@ -0,0 +1,1 @@
  2501. -+3
  2502. -2: Three - test
  2503. -1: [mq]: 2.patch - jane
  2504. -0: [mq]: 1.patch - mary
  2505. -==== qref -m
  2506. -# HG changeset patch
  2507. -# Parent
  2508. -# User test
  2509. -Drei
  2510. -
  2511. -diff -r ... 3
  2512. ---- /dev/null
  2513. -+++ b/3
  2514. -@@ -0,0 +1,1 @@
  2515. -+3
  2516. -2: Drei - test
  2517. -1: [mq]: 2.patch - jane
  2518. -0: [mq]: 1.patch - mary
  2519. -==== qref -u
  2520. -# HG changeset patch
  2521. -# Parent
  2522. -# User mary
  2523. -Drei
  2524. -
  2525. -diff -r ... 3
  2526. ---- /dev/null
  2527. -+++ b/3
  2528. -@@ -0,0 +1,1 @@
  2529. -+3
  2530. -2: Drei - mary
  2531. -1: [mq]: 2.patch - jane
  2532. -0: [mq]: 1.patch - mary
  2533. -==== qref -u -m
  2534. -# HG changeset patch
  2535. -# Parent
  2536. -# User maria
  2537. -Three (again)
  2538. -
  2539. -diff -r ... 3
  2540. ---- /dev/null
  2541. -+++ b/3
  2542. -@@ -0,0 +1,1 @@
  2543. -+3
  2544. -2: Three (again) - maria
  2545. -1: [mq]: 2.patch - jane
  2546. -0: [mq]: 1.patch - mary
  2547. -==== qnew -m
  2548. -adding 4of
  2549. -# HG changeset patch
  2550. -# Parent
  2551. -Four
  2552. -
  2553. -diff -r ... 4of
  2554. ---- /dev/null
  2555. -+++ b/4of
  2556. -@@ -0,0 +1,1 @@
  2557. -+4 t
  2558. -3: Four - test
  2559. -2: Three (again) - maria
  2560. -1: [mq]: 2.patch - jane
  2561. -0: [mq]: 1.patch - mary
  2562. -==== qref -u
  2563. -# HG changeset patch
  2564. -# User jane
  2565. -# Parent
  2566. -Four
  2567. -
  2568. -diff -r ... 4of
  2569. ---- /dev/null
  2570. -+++ b/4of
  2571. -@@ -0,0 +1,1 @@
  2572. -+4 t
  2573. -3: Four - jane
  2574. -2: Three (again) - maria
  2575. -1: [mq]: 2.patch - jane
  2576. -0: [mq]: 1.patch - mary
  2577. -==== qnew with HG header
  2578. -popping 5.patch
  2579. -now at: 4.patch
  2580. -now at: 5.patch
  2581. -# HG changeset patch
  2582. -# User johndoe
  2583. -4: imported patch 5.patch - johndoe
  2584. -3: Four - jane
  2585. -2: Three (again) - maria
  2586. -1: [mq]: 2.patch - jane
  2587. -0: [mq]: 1.patch - mary
  2588. -==== hg qref
  2589. -adding 5
  2590. -# HG changeset patch
  2591. -# Parent
  2592. -# User johndoe
  2593. -
  2594. -diff -r ... 5
  2595. ---- /dev/null
  2596. -+++ b/5
  2597. -@@ -0,0 +1,1 @@
  2598. -+5
  2599. -4: [mq]: 5.patch - johndoe
  2600. -3: Four - jane
  2601. -2: Three (again) - maria
  2602. -1: [mq]: 2.patch - jane
  2603. -0: [mq]: 1.patch - mary
  2604. -==== hg qref -U
  2605. -# HG changeset patch
  2606. -# Parent
  2607. -# User test
  2608. -
  2609. -diff -r ... 5
  2610. ---- /dev/null
  2611. -+++ b/5
  2612. -@@ -0,0 +1,1 @@
  2613. -+5
  2614. -4: [mq]: 5.patch - test
  2615. -3: Four - jane
  2616. -2: Three (again) - maria
  2617. -1: [mq]: 2.patch - jane
  2618. -0: [mq]: 1.patch - mary
  2619. -==== hg qref -u
  2620. -# HG changeset patch
  2621. -# Parent
  2622. -# User johndeere
  2623. -
  2624. -diff -r ... 5
  2625. ---- /dev/null
  2626. -+++ b/5
  2627. -@@ -0,0 +1,1 @@
  2628. -+5
  2629. -4: [mq]: 5.patch - johndeere
  2630. -3: Four - jane
  2631. -2: Three (again) - maria
  2632. -1: [mq]: 2.patch - jane
  2633. -0: [mq]: 1.patch - mary
  2634. -==== qnew with plain header
  2635. -popping 6.patch
  2636. -now at: 5.patch
  2637. -now at: 6.patch
  2638. -From: test
  2639. -
  2640. -5: imported patch 6.patch - test
  2641. -4: [mq]: 5.patch - johndeere
  2642. -3: Four - jane
  2643. -2: Three (again) - maria
  2644. -1: [mq]: 2.patch - jane
  2645. -0: [mq]: 1.patch - mary
  2646. -==== hg qref
  2647. -adding 6
  2648. -From: test
  2649. -
  2650. -diff -r ... 6
  2651. ---- /dev/null
  2652. -+++ b/6
  2653. -@@ -0,0 +1,1 @@
  2654. -+6
  2655. -5: [mq]: 6.patch - test
  2656. -4: [mq]: 5.patch - johndeere
  2657. -3: Four - jane
  2658. -2: Three (again) - maria
  2659. -1: [mq]: 2.patch - jane
  2660. -0: [mq]: 1.patch - mary
  2661. -==== hg qref -U
  2662. -From: test
  2663. -
  2664. -diff -r ... 6
  2665. ---- /dev/null
  2666. -+++ b/6
  2667. -@@ -0,0 +1,1 @@
  2668. -+6
  2669. -5: [mq]: 6.patch - test
  2670. -4: [mq]: 5.patch - johndeere
  2671. -3: Four - jane
  2672. -2: Three (again) - maria
  2673. -1: [mq]: 2.patch - jane
  2674. -0: [mq]: 1.patch - mary
  2675. -==== hg qref -u
  2676. -From: johndeere
  2677. -
  2678. -diff -r ... 6
  2679. ---- /dev/null
  2680. -+++ b/6
  2681. -@@ -0,0 +1,1 @@
  2682. -+6
  2683. -5: [mq]: 6.patch - johndeere
  2684. -4: [mq]: 5.patch - johndeere
  2685. -3: Four - jane
  2686. -2: Three (again) - maria
  2687. -1: [mq]: 2.patch - jane
  2688. -0: [mq]: 1.patch - mary
  2689. -==== qpop -a / qpush -a
  2690. -popping 6.patch
  2691. -popping 5.patch
  2692. -popping 4.patch
  2693. -popping 3.patch
  2694. -popping 2.patch
  2695. -popping 1.patch
  2696. -patch queue now empty
  2697. -applying 1.patch
  2698. -applying 2.patch
  2699. -applying 3.patch
  2700. -applying 4.patch
  2701. -applying 5.patch
  2702. -applying 6.patch
  2703. -now at: 6.patch
  2704. -5: imported patch 6.patch - johndeere
  2705. -4: imported patch 5.patch - johndeere
  2706. -3: Four - jane
  2707. -2: Three (again) - maria
  2708. -1: imported patch 2.patch - jane
  2709. -0: imported patch 1.patch - mary
  2710. -==== init
  2711. -==== qnew -U
  2712. -# HG changeset patch
  2713. -# Parent
  2714. -# User test
  2715. -0: [mq]: 1.patch - test
  2716. -==== qref
  2717. -adding 1
  2718. -# HG changeset patch
  2719. -# Parent
  2720. -# User test
  2721. -
  2722. -diff -r ... 1
  2723. ---- /dev/null
  2724. -+++ b/1
  2725. -@@ -0,0 +1,1 @@
  2726. -+1
  2727. -0: [mq]: 1.patch - test
  2728. -==== qref -u
  2729. -# HG changeset patch
  2730. -# Parent
  2731. -# User mary
  2732. -
  2733. -diff -r ... 1
  2734. ---- /dev/null
  2735. -+++ b/1
  2736. -@@ -0,0 +1,1 @@
  2737. -+1
  2738. -0: [mq]: 1.patch - mary
  2739. -==== qnew
  2740. -adding 2
  2741. -# HG changeset patch
  2742. -# Parent
  2743. -
  2744. -diff -r ... 2
  2745. ---- /dev/null
  2746. -+++ b/2
  2747. -@@ -0,0 +1,1 @@
  2748. -+2
  2749. -1: [mq]: 2.patch - test
  2750. -0: [mq]: 1.patch - mary
  2751. -==== qref -u
  2752. -# HG changeset patch
  2753. -# User jane
  2754. -# Parent
  2755. -
  2756. -diff -r ... 2
  2757. ---- /dev/null
  2758. -+++ b/2
  2759. -@@ -0,0 +1,1 @@
  2760. -+2
  2761. -1: [mq]: 2.patch - jane
  2762. -0: [mq]: 1.patch - mary
  2763. -==== qnew -U -m
  2764. -# HG changeset patch
  2765. -# Parent
  2766. -# User test
  2767. -Three
  2768. -
  2769. -2: Three - test
  2770. -1: [mq]: 2.patch - jane
  2771. -0: [mq]: 1.patch - mary
  2772. -==== qref
  2773. -adding 3
  2774. -# HG changeset patch
  2775. -# Parent
  2776. -# User test
  2777. -Three
  2778. -
  2779. -diff -r ... 3
  2780. ---- /dev/null
  2781. -+++ b/3
  2782. -@@ -0,0 +1,1 @@
  2783. -+3
  2784. -2: Three - test
  2785. -1: [mq]: 2.patch - jane
  2786. -0: [mq]: 1.patch - mary
  2787. -==== qref -m
  2788. -# HG changeset patch
  2789. -# Parent
  2790. -# User test
  2791. -Drei
  2792. -
  2793. -diff -r ... 3
  2794. ---- /dev/null
  2795. -+++ b/3
  2796. -@@ -0,0 +1,1 @@
  2797. -+3
  2798. -2: Drei - test
  2799. -1: [mq]: 2.patch - jane
  2800. -0: [mq]: 1.patch - mary
  2801. -==== qref -u
  2802. -# HG changeset patch
  2803. -# Parent
  2804. -# User mary
  2805. -Drei
  2806. -
  2807. -diff -r ... 3
  2808. ---- /dev/null
  2809. -+++ b/3
  2810. -@@ -0,0 +1,1 @@
  2811. -+3
  2812. -2: Drei - mary
  2813. -1: [mq]: 2.patch - jane
  2814. -0: [mq]: 1.patch - mary
  2815. -==== qref -u -m
  2816. -# HG changeset patch
  2817. -# Parent
  2818. -# User maria
  2819. -Three (again)
  2820. -
  2821. -diff -r ... 3
  2822. ---- /dev/null
  2823. -+++ b/3
  2824. -@@ -0,0 +1,1 @@
  2825. -+3
  2826. -2: Three (again) - maria
  2827. -1: [mq]: 2.patch - jane
  2828. -0: [mq]: 1.patch - mary
  2829. -==== qnew -m
  2830. -adding 4of
  2831. -# HG changeset patch
  2832. -# Parent
  2833. -Four
  2834. -
  2835. -diff -r ... 4of
  2836. ---- /dev/null
  2837. -+++ b/4of
  2838. -@@ -0,0 +1,1 @@
  2839. -+4 t
  2840. -3: Four - test
  2841. -2: Three (again) - maria
  2842. -1: [mq]: 2.patch - jane
  2843. -0: [mq]: 1.patch - mary
  2844. -==== qref -u
  2845. -# HG changeset patch
  2846. -# User jane
  2847. -# Parent
  2848. -Four
  2849. -
  2850. -diff -r ... 4of
  2851. ---- /dev/null
  2852. -+++ b/4of
  2853. -@@ -0,0 +1,1 @@
  2854. -+4 t
  2855. -3: Four - jane
  2856. -2: Three (again) - maria
  2857. -1: [mq]: 2.patch - jane
  2858. -0: [mq]: 1.patch - mary
  2859. -==== qnew with HG header
  2860. -popping 5.patch
  2861. -now at: 4.patch
  2862. -now at: 5.patch
  2863. -# HG changeset patch
  2864. -# User johndoe
  2865. -4: imported patch 5.patch - johndoe
  2866. -3: Four - jane
  2867. -2: Three (again) - maria
  2868. -1: [mq]: 2.patch - jane
  2869. -0: [mq]: 1.patch - mary
  2870. -==== hg qref
  2871. -adding 5
  2872. -# HG changeset patch
  2873. -# Parent
  2874. -# User johndoe
  2875. -
  2876. -diff -r ... 5
  2877. ---- /dev/null
  2878. -+++ b/5
  2879. -@@ -0,0 +1,1 @@
  2880. -+5
  2881. -4: [mq]: 5.patch - johndoe
  2882. -3: Four - jane
  2883. -2: Three (again) - maria
  2884. -1: [mq]: 2.patch - jane
  2885. -0: [mq]: 1.patch - mary
  2886. -==== hg qref -U
  2887. -# HG changeset patch
  2888. -# Parent
  2889. -# User test
  2890. -
  2891. -diff -r ... 5
  2892. ---- /dev/null
  2893. -+++ b/5
  2894. -@@ -0,0 +1,1 @@
  2895. -+5
  2896. -4: [mq]: 5.patch - test
  2897. -3: Four - jane
  2898. -2: Three (again) - maria
  2899. -1: [mq]: 2.patch - jane
  2900. -0: [mq]: 1.patch - mary
  2901. -==== hg qref -u
  2902. -# HG changeset patch
  2903. -# Parent
  2904. -# User johndeere
  2905. -
  2906. -diff -r ... 5
  2907. ---- /dev/null
  2908. -+++ b/5
  2909. -@@ -0,0 +1,1 @@
  2910. -+5
  2911. -4: [mq]: 5.patch - johndeere
  2912. -3: Four - jane
  2913. -2: Three (again) - maria
  2914. -1: [mq]: 2.patch - jane
  2915. -0: [mq]: 1.patch - mary
  2916. -==== qnew with plain header
  2917. -popping 6.patch
  2918. -now at: 5.patch
  2919. -now at: 6.patch
  2920. -From: test
  2921. -
  2922. -5: imported patch 6.patch - test
  2923. -4: [mq]: 5.patch - johndeere
  2924. -3: Four - jane
  2925. -2: Three (again) - maria
  2926. -1: [mq]: 2.patch - jane
  2927. -0: [mq]: 1.patch - mary
  2928. -==== hg qref
  2929. -adding 6
  2930. -From: test
  2931. -
  2932. -diff -r ... 6
  2933. ---- /dev/null
  2934. -+++ b/6
  2935. -@@ -0,0 +1,1 @@
  2936. -+6
  2937. -5: [mq]: 6.patch - test
  2938. -4: [mq]: 5.patch - johndeere
  2939. -3: Four - jane
  2940. -2: Three (again) - maria
  2941. -1: [mq]: 2.patch - jane
  2942. -0: [mq]: 1.patch - mary
  2943. -==== hg qref -U
  2944. -From: test
  2945. -
  2946. -diff -r ... 6
  2947. ---- /dev/null
  2948. -+++ b/6
  2949. -@@ -0,0 +1,1 @@
  2950. -+6
  2951. -5: [mq]: 6.patch - test
  2952. -4: [mq]: 5.patch - johndeere
  2953. -3: Four - jane
  2954. -2: Three (again) - maria
  2955. -1: [mq]: 2.patch - jane
  2956. -0: [mq]: 1.patch - mary
  2957. -==== hg qref -u
  2958. -From: johndeere
  2959. -
  2960. -diff -r ... 6
  2961. ---- /dev/null
  2962. -+++ b/6
  2963. -@@ -0,0 +1,1 @@
  2964. -+6
  2965. -5: [mq]: 6.patch - johndeere
  2966. -4: [mq]: 5.patch - johndeere
  2967. -3: Four - jane
  2968. -2: Three (again) - maria
  2969. -1: [mq]: 2.patch - jane
  2970. -0: [mq]: 1.patch - mary
  2971. -==== qpop -a / qpush -a
  2972. -popping 6.patch
  2973. -popping 5.patch
  2974. -popping 4.patch
  2975. -popping 3.patch
  2976. -popping 2.patch
  2977. -popping 1.patch
  2978. -patch queue now empty
  2979. -applying 1.patch
  2980. -applying 2.patch
  2981. -applying 3.patch
  2982. -applying 4.patch
  2983. -applying 5.patch
  2984. -applying 6.patch
  2985. -now at: 6.patch
  2986. -5: imported patch 6.patch - johndeere
  2987. -4: imported patch 5.patch - johndeere
  2988. -3: Four - jane
  2989. -2: Three (again) - maria
  2990. -1: imported patch 2.patch - jane
  2991. -0: imported patch 1.patch - mary
  2992. +### Abort: timeout after 180 seconds.
  2993. !..............
  2994. ERROR: /home/rupert/hg-crew-10s/tests/test-mq-header-date output changed and returned error code 208
  2995. --- /home/rupert/hg-crew-10s/tests/test-mq-header-date.out
  2996. +++ /home/rupert/hg-crew-10s/tests/test-mq-header-date.err
  2997. -1,698 +1,2 @@
  2998. -======= plain headers
  2999. -==== init
  3000. -==== qnew -d
  3001. -Date: 3 0
  3002.  
  3003. -0: [mq]: 1.patch - test - 3.00
  3004. -==== qref
  3005. -adding 1
  3006. -Date: 3 0
  3007. -
  3008. -diff -r ... 1
  3009. ---- /dev/null
  3010. -+++ b/1
  3011. -@@ -0,0 +1,1 @@
  3012. -+1
  3013. -0: [mq]: 1.patch - test - 3.00
  3014. -==== qref -d
  3015. -Date: 4 0
  3016. -
  3017. -diff -r ... 1
  3018. ---- /dev/null
  3019. -+++ b/1
  3020. -@@ -0,0 +1,1 @@
  3021. -+1
  3022. -0: [mq]: 1.patch - test - 4.00
  3023. -==== qnew
  3024. -adding 2
  3025. -diff -r ... 2
  3026. ---- /dev/null
  3027. -+++ b/2
  3028. -@@ -0,0 +1,1 @@
  3029. -+2
  3030. -1: [mq]: 2.patch - test
  3031. -0: [mq]: 1.patch - test
  3032. -==== qref -d
  3033. -Date: 5 0
  3034. -
  3035. -diff -r ... 2
  3036. ---- /dev/null
  3037. -+++ b/2
  3038. -@@ -0,0 +1,1 @@
  3039. -+2
  3040. -1: [mq]: 2.patch - test
  3041. -0: [mq]: 1.patch - test
  3042. -popping 2.patch
  3043. -now at: 1.patch
  3044. -==== qnew -d -m
  3045. -Date: 6 0
  3046. -
  3047. -Three
  3048. -
  3049. -1: Three - test - 6.00
  3050. -0: [mq]: 1.patch - test - 4.00
  3051. -==== qref
  3052. -adding 3
  3053. -Date: 6 0
  3054. -
  3055. -Three
  3056. -
  3057. -diff -r ... 3
  3058. ---- /dev/null
  3059. -+++ b/3
  3060. -@@ -0,0 +1,1 @@
  3061. -+3
  3062. -1: Three - test - 6.00
  3063. -0: [mq]: 1.patch - test - 4.00
  3064. -==== qref -m
  3065. -Date: 6 0
  3066. -
  3067. -Drei
  3068. -
  3069. -diff -r ... 3
  3070. ---- /dev/null
  3071. -+++ b/3
  3072. -@@ -0,0 +1,1 @@
  3073. -+3
  3074. -1: Drei - test - 6.00
  3075. -0: [mq]: 1.patch - test - 4.00
  3076. -==== qref -d
  3077. -Date: 7 0
  3078. -
  3079. -Drei
  3080. -
  3081. -diff -r ... 3
  3082. ---- /dev/null
  3083. -+++ b/3
  3084. -@@ -0,0 +1,1 @@
  3085. -+3
  3086. -1: Drei - test - 7.00
  3087. -0: [mq]: 1.patch - test - 4.00
  3088. -==== qref -d -m
  3089. -Date: 8 0
  3090. -
  3091. -Three (again)
  3092. -
  3093. -diff -r ... 3
  3094. ---- /dev/null
  3095. -+++ b/3
  3096. -@@ -0,0 +1,1 @@
  3097. -+3
  3098. -1: Three (again) - test - 8.00
  3099. -0: [mq]: 1.patch - test - 4.00
  3100. -==== qnew -m
  3101. -adding 4
  3102. -Four
  3103. -
  3104. -diff -r ... 4
  3105. ---- /dev/null
  3106. -+++ b/4
  3107. -@@ -0,0 +1,1 @@
  3108. -+4
  3109. -2: Four - test
  3110. -1: Three (again) - test
  3111. -0: [mq]: 1.patch - test
  3112. -==== qref -d
  3113. -Date: 9 0
  3114. -Four
  3115. -
  3116. -diff -r ... 4
  3117. ---- /dev/null
  3118. -+++ b/4
  3119. -@@ -0,0 +1,1 @@
  3120. -+4
  3121. -2: Four - test
  3122. -1: Three (again) - test
  3123. -0: [mq]: 1.patch - test
  3124. -popping 4.patch
  3125. -now at: 3.patch
  3126. -==== qnew with HG header
  3127. -popping 5.patch
  3128. -now at: 3.patch
  3129. -# HG changeset patch
  3130. -# Date 10 0
  3131. -2: imported patch 5.patch - test - 10.00
  3132. -1: Three (again) - test - 8.00
  3133. -0: [mq]: 1.patch - test - 4.00
  3134. -==== hg qref
  3135. -adding 5
  3136. -# HG changeset patch
  3137. -# Parent
  3138. -# Date 10 0
  3139. -
  3140. -diff -r ... 5
  3141. ---- /dev/null
  3142. -+++ b/5
  3143. -@@ -0,0 +1,1 @@
  3144. -+5
  3145. -2: [mq]: 5.patch - test - 10.00
  3146. -1: Three (again) - test - 8.00
  3147. -0: [mq]: 1.patch - test - 4.00
  3148. -==== hg qref -d
  3149. -# HG changeset patch
  3150. -# Parent
  3151. -# Date 11 0
  3152. -
  3153. -diff -r ... 5
  3154. ---- /dev/null
  3155. -+++ b/5
  3156. -@@ -0,0 +1,1 @@
  3157. -+5
  3158. -2: [mq]: 5.patch - test - 11.00
  3159. -1: Three (again) - test - 8.00
  3160. -0: [mq]: 1.patch - test - 4.00
  3161. -==== qnew with plain header
  3162. -popping 6.patch
  3163. -now at: 5.patch
  3164. -now at: 6.patch
  3165. -Date: 12 0
  3166. -
  3167. -3: imported patch 6.patch - test
  3168. -2: [mq]: 5.patch - test
  3169. -1: Three (again) - test
  3170. -0: [mq]: 1.patch - test
  3171. -==== hg qref
  3172. -adding 6
  3173. -Date: 12 0
  3174. -
  3175. -diff -r ... 6
  3176. ---- /dev/null
  3177. -+++ b/6
  3178. -@@ -0,0 +1,1 @@
  3179. -+6
  3180. -3: [mq]: 6.patch - test - 12.00
  3181. -2: [mq]: 5.patch - test - 11.00
  3182. -1: Three (again) - test - 8.00
  3183. -0: [mq]: 1.patch - test - 4.00
  3184. -==== hg qref -d
  3185. -Date: 13 0
  3186. -
  3187. -diff -r ... 6
  3188. ---- /dev/null
  3189. -+++ b/6
  3190. -@@ -0,0 +1,1 @@
  3191. -+6
  3192. -3: [mq]: 6.patch - test - 13.00
  3193. -2: [mq]: 5.patch - test - 11.00
  3194. -1: Three (again) - test - 8.00
  3195. -0: [mq]: 1.patch - test - 4.00
  3196. -popping 6.patch
  3197. -now at: 5.patch
  3198. -==== qnew -u
  3199. -adding 6
  3200. -From: jane
  3201. -
  3202. -diff -r ... 6
  3203. ---- /dev/null
  3204. -+++ b/6
  3205. -@@ -0,0 +1,1 @@
  3206. -+6
  3207. -3: [mq]: 6.patch - jane
  3208. -2: [mq]: 5.patch - test
  3209. -1: Three (again) - test
  3210. -0: [mq]: 1.patch - test
  3211. -==== qref -d
  3212. -Date: 12 0
  3213. -From: jane
  3214. -
  3215. -diff -r ... 6
  3216. ---- /dev/null
  3217. -+++ b/6
  3218. -@@ -0,0 +1,1 @@
  3219. -+6
  3220. -3: [mq]: 6.patch - jane
  3221. -2: [mq]: 5.patch - test
  3222. -1: Three (again) - test
  3223. -0: [mq]: 1.patch - test
  3224. -popping 6.patch
  3225. -now at: 5.patch
  3226. -==== qnew -d
  3227. -adding 7
  3228. -Date: 13 0
  3229. -
  3230. -diff -r ... 7
  3231. ---- /dev/null
  3232. -+++ b/7
  3233. -@@ -0,0 +1,1 @@
  3234. -+7
  3235. -3: [mq]: 7.patch - test
  3236. -2: [mq]: 5.patch - test
  3237. -1: Three (again) - test
  3238. -0: [mq]: 1.patch - test
  3239. -==== qref -u
  3240. -From: john
  3241. -Date: 13 0
  3242. -
  3243. -diff -r ... 7
  3244. ---- /dev/null
  3245. -+++ b/7
  3246. -@@ -0,0 +1,1 @@
  3247. -+7
  3248. -3: [mq]: 7.patch - john - 13.00
  3249. -2: [mq]: 5.patch - test - 11.00
  3250. -1: Three (again) - test - 8.00
  3251. -0: [mq]: 1.patch - test - 4.00
  3252. -==== qnew
  3253. -adding 8
  3254. -diff -r ... 8
  3255. ---- /dev/null
  3256. -+++ b/8
  3257. -@@ -0,0 +1,1 @@
  3258. -+8
  3259. -4: [mq]: 8.patch - test
  3260. -3: [mq]: 7.patch - john
  3261. -2: [mq]: 5.patch - test
  3262. -1: Three (again) - test
  3263. -0: [mq]: 1.patch - test
  3264. -==== qref -u -d
  3265. -Date: 14 0
  3266. -From: john
  3267. -
  3268. -diff -r ... 8
  3269. ---- /dev/null
  3270. -+++ b/8
  3271. -@@ -0,0 +1,1 @@
  3272. -+8
  3273. -4: [mq]: 8.patch - john
  3274. -3: [mq]: 7.patch - john
  3275. -2: [mq]: 5.patch - test
  3276. -1: Three (again) - test
  3277. -0: [mq]: 1.patch - test
  3278. -popping 8.patch
  3279. -now at: 7.patch
  3280. -==== qnew -m
  3281. -adding 9
  3282. -Nine
  3283. -
  3284. -diff -r ... 9
  3285. ---- /dev/null
  3286. -+++ b/9
  3287. -@@ -0,0 +1,1 @@
  3288. -+9
  3289. -4: Nine - test
  3290. -3: [mq]: 7.patch - john
  3291. -2: [mq]: 5.patch - test
  3292. -1: Three (again) - test
  3293. -0: [mq]: 1.patch - test
  3294. -==== qref -u -d
  3295. -Date: 15 0
  3296. -From: john
  3297. -Nine
  3298. -
  3299. -diff -r ... 9
  3300. ---- /dev/null
  3301. -+++ b/9
  3302. -@@ -0,0 +1,1 @@
  3303. -+9
  3304. -4: Nine - john
  3305. -3: [mq]: 7.patch - john
  3306. -2: [mq]: 5.patch - test
  3307. -1: Three (again) - test
  3308. -0: [mq]: 1.patch - test
  3309. -popping 9.patch
  3310. -now at: 7.patch
  3311. -==== qpop -a / qpush -a
  3312. -popping 7.patch
  3313. -popping 5.patch
  3314. -popping 3.patch
  3315. -popping 1.patch
  3316. -patch queue now empty
  3317. -applying 1.patch
  3318. -applying 3.patch
  3319. -applying 5.patch
  3320. -applying 7.patch
  3321. -now at: 7.patch
  3322. -3: imported patch 7.patch - john - 13.00
  3323. -2: imported patch 5.patch - test - 11.00
  3324. -1: Three (again) - test - 8.00
  3325. -0: imported patch 1.patch - test - 4.00
  3326. -======= hg headers
  3327. -==== init
  3328. -==== qnew -d
  3329. -# HG changeset patch
  3330. -# Parent
  3331. -# Date 3 0
  3332. -
  3333. -0: [mq]: 1.patch - test - 3.00
  3334. -==== qref
  3335. -adding 1
  3336. -# HG changeset patch
  3337. -# Parent
  3338. -# Date 3 0
  3339. -
  3340. -diff -r ... 1
  3341. ---- /dev/null
  3342. -+++ b/1
  3343. -@@ -0,0 +1,1 @@
  3344. -+1
  3345. -0: [mq]: 1.patch - test - 3.00
  3346. -==== qref -d
  3347. -# HG changeset patch
  3348. -# Parent
  3349. -# Date 4 0
  3350. -
  3351. -diff -r ... 1
  3352. ---- /dev/null
  3353. -+++ b/1
  3354. -@@ -0,0 +1,1 @@
  3355. -+1
  3356. -0: [mq]: 1.patch - test - 4.00
  3357. -==== qnew
  3358. -adding 2
  3359. -# HG changeset patch
  3360. -# Parent
  3361. -
  3362. -diff -r ... 2
  3363. ---- /dev/null
  3364. -+++ b/2
  3365. -@@ -0,0 +1,1 @@
  3366. -+2
  3367. -1: [mq]: 2.patch - test
  3368. -0: [mq]: 1.patch - test
  3369. -==== qref -d
  3370. -# HG changeset patch
  3371. -# Date 5 0
  3372. -# Parent
  3373. -
  3374. -diff -r ... 2
  3375. ---- /dev/null
  3376. -+++ b/2
  3377. -@@ -0,0 +1,1 @@
  3378. -+2
  3379. -1: [mq]: 2.patch - test
  3380. -0: [mq]: 1.patch - test
  3381. -popping 2.patch
  3382. -now at: 1.patch
  3383. -==== qnew -d -m
  3384. -# HG changeset patch
  3385. -# Parent
  3386. -# Date 6 0
  3387. -
  3388. -Three
  3389. -
  3390. -1: Three - test - 6.00
  3391. -0: [mq]: 1.patch - test - 4.00
  3392. -==== qref
  3393. -adding 3
  3394. -# HG changeset patch
  3395. -# Parent
  3396. -# Date 6 0
  3397. -
  3398. -Three
  3399. -
  3400. -diff -r ... 3
  3401. ---- /dev/null
  3402. -+++ b/3
  3403. -@@ -0,0 +1,1 @@
  3404. -+3
  3405. -1: Three - test - 6.00
  3406. -0: [mq]: 1.patch - test - 4.00
  3407. -==== qref -m
  3408. -# HG changeset patch
  3409. -# Parent
  3410. -# Date 6 0
  3411. -
  3412. -Drei
  3413. -
  3414. -diff -r ... 3
  3415. ---- /dev/null
  3416. -+++ b/3
  3417. -@@ -0,0 +1,1 @@
  3418. -+3
  3419. -1: Drei - test - 6.00
  3420. -0: [mq]: 1.patch - test - 4.00
  3421. -==== qref -d
  3422. -# HG changeset patch
  3423. -# Parent
  3424. -# Date 7 0
  3425. -
  3426. -Drei
  3427. -
  3428. -diff -r ... 3
  3429. ---- /dev/null
  3430. -+++ b/3
  3431. -@@ -0,0 +1,1 @@
  3432. -+3
  3433. -1: Drei - test - 7.00
  3434. -0: [mq]: 1.patch - test - 4.00
  3435. -==== qref -d -m
  3436. -# HG changeset patch
  3437. -# Parent
  3438. -# Date 8 0
  3439. -
  3440. -Three (again)
  3441. -
  3442. -diff -r ... 3
  3443. ---- /dev/null
  3444. -+++ b/3
  3445. -@@ -0,0 +1,1 @@
  3446. -+3
  3447. -1: Three (again) - test - 8.00
  3448. -0: [mq]: 1.patch - test - 4.00
  3449. -==== qnew -m
  3450. -adding 4
  3451. -# HG changeset patch
  3452. -# Parent
  3453. -Four
  3454. -
  3455. -diff -r ... 4
  3456. ---- /dev/null
  3457. -+++ b/4
  3458. -@@ -0,0 +1,1 @@
  3459. -+4
  3460. -2: Four - test
  3461. -1: Three (again) - test
  3462. -0: [mq]: 1.patch - test
  3463. -==== qref -d
  3464. -# HG changeset patch
  3465. -# Date 9 0
  3466. -# Parent
  3467. -Four
  3468. -
  3469. -diff -r ... 4
  3470. ---- /dev/null
  3471. -+++ b/4
  3472. -@@ -0,0 +1,1 @@
  3473. -+4
  3474. -2: Four - test
  3475. -1: Three (again) - test
  3476. -0: [mq]: 1.patch - test
  3477. -popping 4.patch
  3478. -now at: 3.patch
  3479. -==== qnew with HG header
  3480. -popping 5.patch
  3481. -now at: 3.patch
  3482. -# HG changeset patch
  3483. -# Date 10 0
  3484. -2: imported patch 5.patch - test - 10.00
  3485. -1: Three (again) - test - 8.00
  3486. -0: [mq]: 1.patch - test - 4.00
  3487. -==== hg qref
  3488. -adding 5
  3489. -# HG changeset patch
  3490. -# Parent
  3491. -# Date 10 0
  3492. -
  3493. -diff -r ... 5
  3494. ---- /dev/null
  3495. -+++ b/5
  3496. -@@ -0,0 +1,1 @@
  3497. -+5
  3498. -2: [mq]: 5.patch - test - 10.00
  3499. -1: Three (again) - test - 8.00
  3500. -0: [mq]: 1.patch - test - 4.00
  3501. -==== hg qref -d
  3502. -# HG changeset patch
  3503. -# Parent
  3504. -# Date 11 0
  3505. -
  3506. -diff -r ... 5
  3507. ---- /dev/null
  3508. -+++ b/5
  3509. -@@ -0,0 +1,1 @@
  3510. -+5
  3511. -2: [mq]: 5.patch - test - 11.00
  3512. -1: Three (again) - test - 8.00
  3513. -0: [mq]: 1.patch - test - 4.00
  3514. -==== qnew with plain header
  3515. -popping 6.patch
  3516. -now at: 5.patch
  3517. -now at: 6.patch
  3518. -Date: 12 0
  3519. -
  3520. -3: imported patch 6.patch - test
  3521. -2: [mq]: 5.patch - test
  3522. -1: Three (again) - test
  3523. -0: [mq]: 1.patch - test
  3524. -==== hg qref
  3525. -adding 6
  3526. -Date: 12 0
  3527. -
  3528. -diff -r ... 6
  3529. ---- /dev/null
  3530. -+++ b/6
  3531. -@@ -0,0 +1,1 @@
  3532. -+6
  3533. -3: [mq]: 6.patch - test - 12.00
  3534. -2: [mq]: 5.patch - test - 11.00
  3535. -1: Three (again) - test - 8.00
  3536. -0: [mq]: 1.patch - test - 4.00
  3537. -==== hg qref -d
  3538. -Date: 13 0
  3539. -
  3540. -diff -r ... 6
  3541. ---- /dev/null
  3542. -+++ b/6
  3543. -@@ -0,0 +1,1 @@
  3544. -+6
  3545. -3: [mq]: 6.patch - test - 13.00
  3546. -2: [mq]: 5.patch - test - 11.00
  3547. -1: Three (again) - test - 8.00
  3548. -0: [mq]: 1.patch - test - 4.00
  3549. -popping 6.patch
  3550. -now at: 5.patch
  3551. -==== qnew -u
  3552. -adding 6
  3553. -# HG changeset patch
  3554. -# Parent
  3555. -# User jane
  3556. -
  3557. -diff -r ... 6
  3558. ---- /dev/null
  3559. -+++ b/6
  3560. -@@ -0,0 +1,1 @@
  3561. -+6
  3562. -3: [mq]: 6.patch - jane
  3563. -2: [mq]: 5.patch - test
  3564. -1: Three (again) - test
  3565. -0: [mq]: 1.patch - test
  3566. -==== qref -d
  3567. -# HG changeset patch
  3568. -# Date 12 0
  3569. -# Parent
  3570. -# User jane
  3571. -
  3572. -diff -r ... 6
  3573. ---- /dev/null
  3574. -+++ b/6
  3575. -@@ -0,0 +1,1 @@
  3576. -+6
  3577. -3: [mq]: 6.patch - jane
  3578. -2: [mq]: 5.patch - test
  3579. -1: Three (again) - test
  3580. -0: [mq]: 1.patch - test
  3581. -popping 6.patch
  3582. -now at: 5.patch
  3583. -==== qnew -d
  3584. -adding 7
  3585. -# HG changeset patch
  3586. -# Parent
  3587. -# Date 13 0
  3588. -
  3589. -diff -r ... 7
  3590. ---- /dev/null
  3591. -+++ b/7
  3592. -@@ -0,0 +1,1 @@
  3593. -+7
  3594. -3: [mq]: 7.patch - test
  3595. -2: [mq]: 5.patch - test
  3596. -1: Three (again) - test
  3597. -0: [mq]: 1.patch - test
  3598. -==== qref -u
  3599. -# HG changeset patch
  3600. -# User john
  3601. -# Parent
  3602. -# Date 13 0
  3603. -
  3604. -diff -r ... 7
  3605. ---- /dev/null
  3606. -+++ b/7
  3607. -@@ -0,0 +1,1 @@
  3608. -+7
  3609. -3: [mq]: 7.patch - john - 13.00
  3610. -2: [mq]: 5.patch - test - 11.00
  3611. -1: Three (again) - test - 8.00
  3612. -0: [mq]: 1.patch - test - 4.00
  3613. -==== qnew
  3614. -adding 8
  3615. -# HG changeset patch
  3616. -# Parent
  3617. -
  3618. -diff -r ... 8
  3619. ---- /dev/null
  3620. -+++ b/8
  3621. -@@ -0,0 +1,1 @@
  3622. -+8
  3623. -4: [mq]: 8.patch - test
  3624. -3: [mq]: 7.patch - john
  3625. -2: [mq]: 5.patch - test
  3626. -1: Three (again) - test
  3627. -0: [mq]: 1.patch - test
  3628. -==== qref -u -d
  3629. -# HG changeset patch
  3630. -# Date 14 0
  3631. -# User john
  3632. -# Parent
  3633. -
  3634. -diff -r ... 8
  3635. ---- /dev/null
  3636. -+++ b/8
  3637. -@@ -0,0 +1,1 @@
  3638. -+8
  3639. -4: [mq]: 8.patch - john
  3640. -3: [mq]: 7.patch - john
  3641. -2: [mq]: 5.patch - test
  3642. -1: Three (again) - test
  3643. -0: [mq]: 1.patch - test
  3644. -popping 8.patch
  3645. -now at: 7.patch
  3646. -==== qnew -m
  3647. -adding 9
  3648. -# HG changeset patch
  3649. -# Parent
  3650. -Nine
  3651. -
  3652. -diff -r ... 9
  3653. ---- /dev/null
  3654. -+++ b/9
  3655. -@@ -0,0 +1,1 @@
  3656. -+9
  3657. -4: Nine - test
  3658. -3: [mq]: 7.patch - john
  3659. -2: [mq]: 5.patch - test
  3660. -1: Three (again) - test
  3661. -0: [mq]: 1.patch - test
  3662. -==== qref -u -d
  3663. -# HG changeset patch
  3664. -# Date 15 0
  3665. -# User john
  3666. -# Parent
  3667. -Nine
  3668. -
  3669. -diff -r ... 9
  3670. ---- /dev/null
  3671. -+++ b/9
  3672. -@@ -0,0 +1,1 @@
  3673. -+9
  3674. -4: Nine - john
  3675. -3: [mq]: 7.patch - john
  3676. -2: [mq]: 5.patch - test
  3677. -1: Three (again) - test
  3678. -0: [mq]: 1.patch - test
  3679. -popping 9.patch
  3680. -now at: 7.patch
  3681. -==== qpop -a / qpush -a
  3682. -popping 7.patch
  3683. -popping 5.patch
  3684. -popping 3.patch
  3685. -popping 1.patch
  3686. -patch queue now empty
  3687. -applying 1.patch
  3688. -applying 3.patch
  3689. -applying 5.patch
  3690. -applying 7.patch
  3691. -now at: 7.patch
  3692. -3: imported patch 7.patch - john - 13.00
  3693. -2: imported patch 5.patch - test - 11.00
  3694. -1: Three (again) - test - 8.00
  3695. -0: imported patch 1.patch - test - 4.00
  3696. +### Abort: timeout after 180 seconds.
  3697. !..
  3698. ERROR: /home/rupert/hg-crew-10s/tests/test-keyword output changed and returned error code 208
  3699. --- /home/rupert/hg-crew-10s/tests/test-keyword.out
  3700. +++ /home/rupert/hg-crew-10s/tests/test-keyword.err
  3701. -1,480 +1,2 @@
  3702. -% hg kwdemo
  3703. -[extensions]
  3704. -keyword =
  3705. -[keyword]
  3706. -demo.txt =
  3707. -[keywordmaps]
  3708. -Author = {author|user}
  3709. -Date = {date|utcdate}
  3710. -Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
  3711. -Id = {file|basename},v {node|short} {date|utcdate} {author|user}
  3712. -RCSFile = {file|basename},v
  3713. -RCSfile = {file|basename},v
  3714. -Revision = {node|short}
  3715. -Source = {root}/{file},v
  3716. -$Author: test $
  3717. -$Date: 2000/00/00 00:00:00 $
  3718. -$Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
  3719. -$Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
  3720. -$RCSFile: demo.txt,v $
  3721. -$RCSfile: demo.txt,v $
  3722. -$Revision: xxxxxxxxxxxx $
  3723. -$Source: /TMP/demo.txt,v $
  3724. -[extensions]
  3725. -keyword =
  3726. -[keyword]
  3727. -demo.txt =
  3728. -[keywordmaps]
  3729. -Branch = {branches}
  3730. -$Branch: demobranch $
  3731. -% kwshrink should exit silently in empty/invalid repo
  3732. -pulling from test-keyword.hg
  3733. -requesting all changes
  3734. -adding changesets
  3735. -adding manifests
  3736. -adding file changes
  3737. -added 1 changesets with 1 changes to 1 files
  3738. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  3739. -% cat
  3740. -expand $Id$
  3741. -do not process $Id:
  3742. -xxx $
  3743. -ignore $Id$
  3744. -% no kwfiles
  3745. -% untracked candidates
  3746. -k a
  3747. -% addremove
  3748. -adding a
  3749. -adding b
  3750. -% status
  3751. -A a
  3752. -A b
  3753. -% default keyword expansion including commit hook
  3754. -% interrupted commit should not change state or run commit hook
  3755. -abort: empty commit message
  3756. -% status
  3757. -A a
  3758. -A b
  3759. -% commit
  3760. -a
  3761. -b
  3762. -overwriting a expanding keywords
  3763. -running hook commit.test: cp a hooktest
  3764. -committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
  3765. -% status
  3766. -? hooktest
  3767. -% identify
  3768. -ef63ca68695b
  3769. -% cat
  3770. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3771. -do not process $Id:
  3772. -xxx $
  3773. -ignore $Id$
  3774. -% hg cat
  3775. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3776. -do not process $Id:
  3777. -xxx $
  3778. -ignore $Id$
  3779. -a
  3780. -% diff a hooktest
  3781. -% removing commit hook from config
  3782. -% bundle
  3783. -2 changesets found
  3784. -% notify on pull to check whether keywords stay as is in email
  3785. -% ie. if patch.diff wrapper acts as it should
  3786. -% pull from bundle
  3787. -pulling from ../kw.hg
  3788. -requesting all changes
  3789. -adding changesets
  3790. -adding manifests
  3791. -adding file changes
  3792. -added 2 changesets with 3 changes to 3 files
  3793.  
  3794. -diff -r 000000000000 -r a2392c293916 sym
  3795. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  3796. -+++ b/sym Sat Feb 09 20:25:47 2008 +0100
  3797. -@@ -0,0 +1,1 @@
  3798. -+a
  3799. -\ No newline at end of file
  3800. -
  3801. -diff -r a2392c293916 -r ef63ca68695b a
  3802. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  3803. -+++ b/a Thu Jan 01 00:00:00 1970 +0000
  3804. -@@ -0,0 +1,3 @@
  3805. -+expand $Id$
  3806. -+do not process $Id:
  3807. -+xxx $
  3808. -diff -r a2392c293916 -r ef63ca68695b b
  3809. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  3810. -+++ b/b Thu Jan 01 00:00:00 1970 +0000
  3811. -@@ -0,0 +1,1 @@
  3812. -+ignore $Id$
  3813. -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  3814. -% remove notify config
  3815. -% touch
  3816. -% status
  3817. -% update
  3818. -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  3819. -% cat
  3820. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3821. -do not process $Id:
  3822. -xxx $
  3823. -ignore $Id$
  3824. -% check whether expansion is filewise
  3825. -% commit c
  3826. -adding c
  3827. -% force expansion
  3828. -overwriting a expanding keywords
  3829. -overwriting c expanding keywords
  3830. -% compare changenodes in a c
  3831. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3832. -do not process $Id:
  3833. -xxx $
  3834. -$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
  3835. -tests for different changenodes
  3836. -% qinit -c
  3837. -% qimport
  3838. -% qcommit
  3839. -% keywords should not be expanded in patch
  3840. -# HG changeset patch
  3841. -# User User Name <user@example.com>
  3842. -# Date 1 0
  3843. -# Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
  3844. -# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9
  3845. -cndiff
  3846. -
  3847. -diff -r ef63ca68695b -r 40a904bbbe4c c
  3848. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  3849. -+++ b/c Thu Jan 01 00:00:01 1970 +0000
  3850. -@@ -0,0 +1,2 @@
  3851. -+$Id$
  3852. -+tests for different changenodes
  3853. -% qpop
  3854. -popping mqtest.diff
  3855. -patch queue now empty
  3856. -% qgoto - should imply qpush
  3857. -applying mqtest.diff
  3858. -now at: mqtest.diff
  3859. -% cat
  3860. -$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
  3861. -tests for different changenodes
  3862. -% qpop and move on
  3863. -popping mqtest.diff
  3864. -patch queue now empty
  3865. -% copy
  3866. -% kwfiles added
  3867. -a
  3868. -c
  3869. -% commit
  3870. -c
  3871. - c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
  3872. -overwriting c expanding keywords
  3873. -committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
  3874. -% cat a c
  3875. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3876. -do not process $Id:
  3877. -xxx $
  3878. -expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
  3879. -do not process $Id:
  3880. -xxx $
  3881. -% touch copied c
  3882. -% status
  3883. -% kwfiles
  3884. -a
  3885. -c
  3886. -% ignored files
  3887. -I b
  3888. -I sym
  3889. -% all files
  3890. -K a
  3891. -K c
  3892. -I b
  3893. -I sym
  3894. -% diff --rev
  3895. -diff -r ef63ca68695b c
  3896. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  3897. -@@ -0,0 +1,3 @@
  3898. -+expand $Id$
  3899. -+do not process $Id:
  3900. -+xxx $
  3901. -% rollback
  3902. -rolling back last transaction
  3903. -% status
  3904. -A c
  3905. -% update -C
  3906. -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  3907. -% custom keyword expansion
  3908. -% try with kwdemo
  3909. -[extensions]
  3910. -keyword =
  3911. -[keyword]
  3912. -* =
  3913. -b = ignore
  3914. -demo.txt =
  3915. -[keywordmaps]
  3916. -Xinfo = {author}: {desc}
  3917. -$Xinfo: test: hg keyword configuration and expansion example $
  3918. -% cat
  3919. -expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
  3920. -do not process $Id:
  3921. -xxx $
  3922. -ignore $Id$
  3923. -% hg cat
  3924. -expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
  3925. -do not process $Id:
  3926. -xxx $
  3927. -ignore $Id$
  3928. -a
  3929. -% interrupted commit should not change state
  3930. -abort: empty commit message
  3931. -% status
  3932. -M a
  3933. -? c
  3934. -? log
  3935. -% commit
  3936. -a
  3937. -overwriting a expanding keywords
  3938. -committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
  3939. -% status
  3940. -? c
  3941. -% verify
  3942. -checking changesets
  3943. -checking manifests
  3944. -crosschecking files in changesets and manifests
  3945. -checking files
  3946. -3 files, 3 changesets, 4 total revisions
  3947. -% cat
  3948. -expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
  3949. -do not process $Id:
  3950. -xxx $
  3951. -$Xinfo: User Name <user@example.com>: firstline $
  3952. -ignore $Id$
  3953. -% hg cat
  3954. -expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
  3955. -do not process $Id:
  3956. -xxx $
  3957. -$Xinfo: User Name <user@example.com>: firstline $
  3958. -ignore $Id$
  3959. -a
  3960. -% annotate
  3961. -1: expand $Id$
  3962. -1: do not process $Id:
  3963. -1: xxx $
  3964. -2: $Xinfo$
  3965. -% remove
  3966. -committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
  3967. -% status
  3968. -? c
  3969. -% rollback
  3970. -rolling back last transaction
  3971. -% status
  3972. -R a
  3973. -? c
  3974. -% revert a
  3975. -% cat a
  3976. -expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
  3977. -do not process $Id:
  3978. -xxx $
  3979. -$Xinfo: User Name <user@example.com>: firstline $
  3980. -% clone to test incoming
  3981. -requesting all changes
  3982. -adding changesets
  3983. -adding manifests
  3984. -adding file changes
  3985. -added 2 changesets with 3 changes to 3 files
  3986. -updating to branch default
  3987. -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  3988. -% incoming
  3989. -comparing with test-keyword/Test
  3990. -searching for changes
  3991. -changeset: 2:bb948857c743
  3992. -tag: tip
  3993. -user: User Name <user@example.com>
  3994. -date: Thu Jan 01 00:00:02 1970 +0000
  3995. -summary: firstline
  3996. -
  3997. -% commit rejecttest
  3998. -a
  3999. -overwriting a expanding keywords
  4000. -committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
  4001. -% export
  4002. -% import
  4003. -applying ../rejecttest.diff
  4004. -% cat
  4005. -expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
  4006. -do not process $Id: rejecttest
  4007. -xxx $
  4008. -$Xinfo: User Name <user@example.com>: rejects? $
  4009. -ignore $Id$
  4010. -
  4011. -% rollback
  4012. -rolling back last transaction
  4013. -% clean update
  4014. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4015. -% kwexpand/kwshrink on selected files
  4016. -% copy a x/a
  4017. -% kwexpand a
  4018. -overwriting a expanding keywords
  4019. -% kwexpand x/a should abort
  4020. -abort: outstanding uncommitted changes
  4021. -x/a
  4022. - x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
  4023. -overwriting x/a expanding keywords
  4024. -committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
  4025. -% cat a
  4026. -expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
  4027. -do not process $Id:
  4028. -xxx $
  4029. -$Xinfo: User Name <user@example.com>: xa $
  4030. -% kwshrink a inside directory x
  4031. -overwriting x/a shrinking keywords
  4032. -% cat a
  4033. -expand $Id$
  4034. -do not process $Id:
  4035. -xxx $
  4036. -$Xinfo$
  4037. -% kwexpand nonexistent
  4038. -nonexistent:
  4039. -% hg serve
  4040. -% expansion
  4041. -% hgweb file
  4042. -200 Script output follows
  4043. -
  4044. -expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
  4045. -do not process $Id:
  4046. -xxx $
  4047. -$Xinfo: User Name <user@example.com>: firstline $
  4048. -% no expansion
  4049. -% hgweb annotate
  4050. -200 Script output follows
  4051. -
  4052. -
  4053. -user@1: expand $Id$
  4054. -user@1: do not process $Id:
  4055. -user@1: xxx $
  4056. -user@2: $Xinfo$
  4057. -
  4058. -
  4059. -
  4060. -
  4061. -% hgweb changeset
  4062. -200 Script output follows
  4063. -
  4064. -
  4065. -# HG changeset patch
  4066. -# User User Name <user@example.com>
  4067. -# Date 3 0
  4068. -# Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
  4069. -# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
  4070. -xa
  4071. -
  4072. -diff -r bb948857c743 -r b4560182a3f9 x/a
  4073. ---- /dev/null Thu Jan 01 00:00:00 1970 +0000
  4074. -+++ b/x/a Thu Jan 01 00:00:03 1970 +0000
  4075. -@@ -0,0 +1,4 @@
  4076. -+expand $Id$
  4077. -+do not process $Id:
  4078. -+xxx $
  4079. -+$Xinfo$
  4080. -
  4081. -% hgweb filediff
  4082. -200 Script output follows
  4083. -
  4084. -
  4085. -diff -r ef63ca68695b -r bb948857c743 a
  4086. ---- a/a Thu Jan 01 00:00:00 1970 +0000
  4087. -+++ b/a Thu Jan 01 00:00:02 1970 +0000
  4088. -@@ -1,3 +1,4 @@
  4089. - expand $Id$
  4090. - do not process $Id:
  4091. - xxx $
  4092. -+$Xinfo$
  4093. -
  4094. -
  4095. -
  4096. -
  4097. -% errors encountered
  4098. -% merge/resolve
  4099. -% simplemerge
  4100. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4101. -created new head
  4102. -0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4103. -(branch merge, don't forget to commit)
  4104. -$Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
  4105. -foo
  4106. -% conflict
  4107. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4108. -created new head
  4109. -merging m
  4110. -warning: conflicts during merge.
  4111. -merging m failed!
  4112. -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  4113. -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
  4114. -% keyword stays outside conflict zone
  4115. -$Id$
  4116. -<<<<<<< local
  4117. -bar
  4118. -=======
  4119. -foo
  4120. ->>>>>>> other
  4121. -% resolve to local
  4122. -$Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $
  4123. -bar
  4124. -% test restricted mode with transplant -b
  4125. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4126. -marked working directory as branch foo
  4127. -created new head
  4128. -2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  4129. -applying 4aa30d025d50
  4130. -4aa30d025d50 transplanted to 5a4da427c162
  4131. -% no expansion in changeset
  4132. -changeset: 11:5a4da427c162
  4133. -tag: tip
  4134. -parent: 9:41efa6d38e9b
  4135. -user: test
  4136. -date: Thu Jan 01 00:00:00 1970 +0000
  4137. -summary: 9foobranch
  4138. -
  4139. -diff -r 41efa6d38e9b -r 5a4da427c162 a
  4140. ---- a/a Thu Jan 01 00:00:00 1970 +0000
  4141. -+++ b/a Thu Jan 01 00:00:00 1970 +0000
  4142. -@@ -1,3 +1,4 @@
  4143. -+foobranch
  4144. - expand $Id$
  4145. - do not process $Id:
  4146. - xxx $
  4147. -
  4148. -% expansion in file
  4149. -foobranch
  4150. -expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $
  4151. -% switch off expansion
  4152. -% kwshrink with unknown file u
  4153. -overwriting a shrinking keywords
  4154. -overwriting m shrinking keywords
  4155. -overwriting x/a shrinking keywords
  4156. -% cat
  4157. -expand $Id$
  4158. -do not process $Id:
  4159. -xxx $
  4160. -$Xinfo$
  4161. -ignore $Id$
  4162. -% hg cat
  4163. -expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
  4164. -do not process $Id:
  4165. -xxx $
  4166. -$Xinfo: User Name <user@example.com>: firstline $
  4167. -ignore $Id$
  4168. -a
  4169. -% cat
  4170. -expand $Id$
  4171. -do not process $Id:
  4172. -xxx $
  4173. -$Xinfo$
  4174. -ignore $Id$
  4175. -% hg cat
  4176. -expand $Id$
  4177. -do not process $Id:
  4178. -xxx $
  4179. -$Xinfo$
  4180. -ignore $Id$
  4181. -a
  4182. +### Abort: timeout after 180 seconds.
  4183. !.............................
  4184. ERROR: /home/rupert/hg-crew-10s/tests/test-rebase-parameters output changed and returned error code 208
  4185. --- /home/rupert/hg-crew-10s/tests/test-rebase-parameters.out
  4186. +++ /home/rupert/hg-crew-10s/tests/test-rebase-parameters.err
  4187. -1,204 +1,2 @@
  4188. -% These fail
  4189.  
  4190. -% Use continue and abort
  4191. -hg rebase: cannot use both abort and continue
  4192. -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]
  4193. -
  4194. -move changeset (and descendants) to a different branch
  4195. -
  4196. - Rebase uses repeated merging to graft changesets from one part of history
  4197. - onto another. This can be useful for linearizing local changes relative to
  4198. - a master development tree.
  4199. -
  4200. - If a rebase is interrupted to manually resolve a merge, it can be
  4201. - continued with --continue/-c or aborted with --abort/-a.
  4202. -
  4203. -options:
  4204. -
  4205. - -s --source rebase from a given revision
  4206. - -b --base rebase from the base of a given revision
  4207. - -d --dest rebase onto a given revision
  4208. - --collapse collapse the rebased changesets
  4209. - --keep keep original changesets
  4210. - --keepbranches keep original branch names
  4211. - --detach force detaching of source from its original branch
  4212. - -c --continue continue an interrupted rebase
  4213. - -a --abort abort an interrupted rebase
  4214. - --style display using template map file
  4215. - --template display with template
  4216. -
  4217. -use "hg -v help rebase" to show global options
  4218. -
  4219. -% Use continue and collapse
  4220. -hg rebase: cannot use collapse with continue or abort
  4221. -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]
  4222. -
  4223. -move changeset (and descendants) to a different branch
  4224. -
  4225. - Rebase uses repeated merging to graft changesets from one part of history
  4226. - onto another. This can be useful for linearizing local changes relative to
  4227. - a master development tree.
  4228. -
  4229. - If a rebase is interrupted to manually resolve a merge, it can be
  4230. - continued with --continue/-c or aborted with --abort/-a.
  4231. -
  4232. -options:
  4233. -
  4234. - -s --source rebase from a given revision
  4235. - -b --base rebase from the base of a given revision
  4236. - -d --dest rebase onto a given revision
  4237. - --collapse collapse the rebased changesets
  4238. - --keep keep original changesets
  4239. - --keepbranches keep original branch names
  4240. - --detach force detaching of source from its original branch
  4241. - -c --continue continue an interrupted rebase
  4242. - -a --abort abort an interrupted rebase
  4243. - --style display using template map file
  4244. - --template display with template
  4245. -
  4246. -use "hg -v help rebase" to show global options
  4247. -
  4248. -% Use continue/abort and dest/source
  4249. -hg rebase: abort and continue do not allow specifying revisions
  4250. -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]
  4251. -
  4252. -move changeset (and descendants) to a different branch
  4253. -
  4254. - Rebase uses repeated merging to graft changesets from one part of history
  4255. - onto another. This can be useful for linearizing local changes relative to
  4256. - a master development tree.
  4257. -
  4258. - If a rebase is interrupted to manually resolve a merge, it can be
  4259. - continued with --continue/-c or aborted with --abort/-a.
  4260. -
  4261. -options:
  4262. -
  4263. - -s --source rebase from a given revision
  4264. - -b --base rebase from the base of a given revision
  4265. - -d --dest rebase onto a given revision
  4266. - --collapse collapse the rebased changesets
  4267. - --keep keep original changesets
  4268. - --keepbranches keep original branch names
  4269. - --detach force detaching of source from its original branch
  4270. - -c --continue continue an interrupted rebase
  4271. - -a --abort abort an interrupted rebase
  4272. - --style display using template map file
  4273. - --template display with template
  4274. -
  4275. -use "hg -v help rebase" to show global options
  4276. -
  4277. -% Use source and base
  4278. -hg rebase: cannot specify both a revision and a base
  4279. -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]
  4280. -
  4281. -move changeset (and descendants) to a different branch
  4282. -
  4283. - Rebase uses repeated merging to graft changesets from one part of history
  4284. - onto another. This can be useful for linearizing local changes relative to
  4285. - a master development tree.
  4286. -
  4287. - If a rebase is interrupted to manually resolve a merge, it can be
  4288. - continued with --continue/-c or aborted with --abort/-a.
  4289. -
  4290. -options:
  4291. -
  4292. - -s --source rebase from a given revision
  4293. - -b --base rebase from the base of a given revision
  4294. - -d --dest rebase onto a given revision
  4295. - --collapse collapse the rebased changesets
  4296. - --keep keep original changesets
  4297. - --keepbranches keep original branch names
  4298. - --detach force detaching of source from its original branch
  4299. - -c --continue continue an interrupted rebase
  4300. - -a --abort abort an interrupted rebase
  4301. - --style display using template map file
  4302. - --template display with template
  4303. -
  4304. -use "hg -v help rebase" to show global options
  4305. -
  4306. -% Rebase with no arguments - from current
  4307. -nothing to rebase
  4308. -
  4309. -% Rebase with no arguments - from the current branch
  4310. -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  4311. -nothing to rebase
  4312. -% ----------
  4313. -% These work
  4314. -
  4315. -% Rebase with no arguments (from 3 onto 7)
  4316. -3 files updated, 0 files merged, 2 files removed, 0 files unresolved
  4317. -saving bundle to
  4318. -adding branch
  4319. -adding changesets
  4320. -adding manifests
  4321. -adding file changes
  4322. -added 5 changesets with 5 changes to 5 files
  4323. -rebase completed
  4324. -% Try to rollback after a rebase (fail)
  4325. -no rollback information available
  4326. -
  4327. -% Rebase with base == '.' => same as no arguments (from 3 onto 7)
  4328. -3 files updated, 0 files merged, 3 files removed, 0 files unresolved
  4329. -saving bundle to
  4330. -adding branch
  4331. -adding changesets
  4332. -adding manifests
  4333. -adding file changes
  4334. -added 5 changesets with 5 changes to 5 files
  4335. -rebase completed
  4336. -
  4337. -% Rebase with dest == default => same as no arguments (from 3 onto 7)
  4338. -3 files updated, 0 files merged, 3 files removed, 0 files unresolved
  4339. -saving bundle to
  4340. -adding branch
  4341. -adding changesets
  4342. -adding manifests
  4343. -adding file changes
  4344. -added 5 changesets with 5 changes to 5 files
  4345. -rebase completed
  4346. -
  4347. -% Specify only source (from 4 onto 7)
  4348. -saving bundle to
  4349. -adding branch
  4350. -adding changesets
  4351. -adding manifests
  4352. -adding file changes
  4353. -added 4 changesets with 4 changes to 4 files (-1 heads)
  4354. -rebase completed
  4355. -
  4356. -% Specify only dest (from 3 onto 6)
  4357. -3 files updated, 0 files merged, 3 files removed, 0 files unresolved
  4358. -saving bundle to
  4359. -adding branch
  4360. -adding changesets
  4361. -adding manifests
  4362. -adding file changes
  4363. -added 5 changesets with 5 changes to 5 files (+1 heads)
  4364. -rebase completed
  4365. -
  4366. -% Specify only base (from 3 onto 7)
  4367. -saving bundle to
  4368. -adding branch
  4369. -adding changesets
  4370. -adding manifests
  4371. -adding file changes
  4372. -added 5 changesets with 5 changes to 5 files
  4373. -rebase completed
  4374. -
  4375. -% Specify source and dest (from 4 onto 6)
  4376. -saving bundle to
  4377. -adding branch
  4378. -adding changesets
  4379. -adding manifests
  4380. -adding file changes
  4381. -added 4 changesets with 4 changes to 4 files
  4382. -rebase completed
  4383. -
  4384. -% Specify base and dest (from 3 onto 6)
  4385. -saving bundle to
  4386. -adding branch
  4387. -adding changesets
  4388. -adding manifests
  4389. -adding file changes
  4390. -added 5 changesets with 5 changes to 5 files (+1 heads)
  4391. -rebase completed
  4392. +### Abort: timeout after 180 seconds.
  4393. !...............
  4394. ERROR: /home/rupert/hg-crew-10s/tests/test-static-http output changed
  4395. --- /home/rupert/hg-crew-10s/tests/test-static-http.out
  4396. +++ /home/rupert/hg-crew-10s/tests/test-static-http.err
  4397. -1,4 +1,4 @@
  4398. -abort: error: Connection refused
  4399. +abort: error: Network is unreachable
  4400. 255
  4401. copy: No such file or directory
  4402. changeset: 0:53e17d176ae6
  4403. !..........
  4404. ERROR: /home/rupert/hg-crew-10s/tests/test-rename-merge2 output changed and returned error code 208
  4405. --- /home/rupert/hg-crew-10s/tests/test-rename-merge2.out
  4406. +++ /home/rupert/hg-crew-10s/tests/test-rename-merge2.err
  4407. -1,651 +1,2 @@
  4408. -created new head
  4409. ---------------
  4410. -test L:up a R:nc a b W: - 1 get local a to b
  4411. ---------------
  4412. - searching for copies back to rev 1
  4413. - unmatched files in other:
  4414. - b
  4415. - all copies found (* = to merge, ! = divergent):
  4416. - b -> a *
  4417. - checking for directory renames
  4418. -resolving manifests
  4419. - overwrite None partial False
  4420. - ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24
  4421. - rev: versions differ -> m
  4422. - a: remote copied to b -> m
  4423. -preserving a for resolve of b
  4424. -preserving rev for resolve of rev
  4425. -update: a 1/2 files (50.00%)
  4426. -picked tool 'python ../merge' for b (binary False symlink False)
  4427. -merging a and b to b
  4428. -my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
  4429. - premerge successful
  4430. -update: rev 2/2 files (100.00%)
  4431. -picked tool 'python ../merge' for rev (binary False symlink False)
  4432. -merging rev
  4433. -my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
  4434. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4435. -(branch merge, don't forget to commit)
  4436. ---------------
  4437. -M b
  4438. - a
  4439. -C a
  4440. ---------------
  4441.  
  4442. -created new head
  4443. ---------------
  4444. -test L:nc a b R:up a W: - 2 get rem change to a and b
  4445. ---------------
  4446. - searching for copies back to rev 1
  4447. - unmatched files in local:
  4448. - b
  4449. - all copies found (* = to merge, ! = divergent):
  4450. - b -> a *
  4451. - checking for directory renames
  4452. -resolving manifests
  4453. - overwrite None partial False
  4454. - ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71
  4455. - a: remote is newer -> g
  4456. - b: local copied/moved to a -> m
  4457. - rev: versions differ -> m
  4458. -preserving b for resolve of b
  4459. -preserving rev for resolve of rev
  4460. -update: a 1/3 files (33.33%)
  4461. -getting a
  4462. -update: b 2/3 files (66.67%)
  4463. -picked tool 'python ../merge' for b (binary False symlink False)
  4464. -merging b and a to b
  4465. -my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
  4466. - premerge successful
  4467. -update: rev 3/3 files (100.00%)
  4468. -picked tool 'python ../merge' for rev (binary False symlink False)
  4469. -merging rev
  4470. -my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
  4471. -1 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4472. -(branch merge, don't forget to commit)
  4473. ---------------
  4474. -M a
  4475. -M b
  4476. - a
  4477. ---------------
  4478. -
  4479. -created new head
  4480. ---------------
  4481. -test L:up a R:nm a b W: - 3 get local a change to b, remove a
  4482. ---------------
  4483. - searching for copies back to rev 1
  4484. - unmatched files in other:
  4485. - b
  4486. - all copies found (* = to merge, ! = divergent):
  4487. - b -> a *
  4488. - checking for directory renames
  4489. -resolving manifests
  4490. - overwrite None partial False
  4491. - ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a
  4492. - rev: versions differ -> m
  4493. - a: remote moved to b -> m
  4494. -preserving a for resolve of b
  4495. -preserving rev for resolve of rev
  4496. -removing a
  4497. -update: a 1/2 files (50.00%)
  4498. -picked tool 'python ../merge' for b (binary False symlink False)
  4499. -merging a and b to b
  4500. -my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
  4501. - premerge successful
  4502. -update: rev 2/2 files (100.00%)
  4503. -picked tool 'python ../merge' for rev (binary False symlink False)
  4504. -merging rev
  4505. -my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
  4506. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4507. -(branch merge, don't forget to commit)
  4508. ---------------
  4509. -M b
  4510. - a
  4511. ---------------
  4512. -
  4513. -created new head
  4514. ---------------
  4515. -test L:nm a b R:up a W: - 4 get remote change to b
  4516. ---------------
  4517. - searching for copies back to rev 1
  4518. - unmatched files in local:
  4519. - b
  4520. - all copies found (* = to merge, ! = divergent):
  4521. - b -> a *
  4522. - checking for directory renames
  4523. -resolving manifests
  4524. - overwrite None partial False
  4525. - ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71
  4526. - b: local copied/moved to a -> m
  4527. - rev: versions differ -> m
  4528. -preserving b for resolve of b
  4529. -preserving rev for resolve of rev
  4530. -update: b 1/2 files (50.00%)
  4531. -picked tool 'python ../merge' for b (binary False symlink False)
  4532. -merging b and a to b
  4533. -my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
  4534. - premerge successful
  4535. -update: rev 2/2 files (100.00%)
  4536. -picked tool 'python ../merge' for rev (binary False symlink False)
  4537. -merging rev
  4538. -my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
  4539. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4540. -(branch merge, don't forget to commit)
  4541. ---------------
  4542. -M b
  4543. - a
  4544. ---------------
  4545. -
  4546. -created new head
  4547. ---------------
  4548. -test L: R:nc a b W: - 5 get b
  4549. ---------------
  4550. - searching for copies back to rev 1
  4551. - unmatched files in other:
  4552. - b
  4553. - all copies found (* = to merge, ! = divergent):
  4554. - b -> a
  4555. - checking for directory renames
  4556. -resolving manifests
  4557. - overwrite None partial False
  4558. - ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24
  4559. - rev: versions differ -> m
  4560. - b: remote created -> g
  4561. -preserving rev for resolve of rev
  4562. -update: b 1/2 files (50.00%)
  4563. -getting b
  4564. -update: rev 2/2 files (100.00%)
  4565. -picked tool 'python ../merge' for rev (binary False symlink False)
  4566. -merging rev
  4567. -my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
  4568. -1 files updated, 1 files merged, 0 files removed, 0 files unresolved
  4569. -(branch merge, don't forget to commit)
  4570. ---------------
  4571. -M b
  4572. -C a
  4573. ---------------
  4574. -
  4575. -created new head
  4576. ---------------
  4577. -test L:nc a b R: W: - 6 nothing
  4578. ---------------
  4579. - searching for copies back to rev 1
  4580. - unmatched files in local:
  4581. - b
  4582. - all copies found (* = to merge, ! = divergent):
  4583. - b -> a
  4584. - checking for directory renames
  4585. -resolving manifests
  4586. - overwrite None partial False
  4587. - ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336
  4588. - rev: versions differ -> m
  4589. -preserving rev for resolve of rev
  4590. -update: rev 1/1 files (100.00%)
  4591. -picked tool 'python ../merge' for rev (binary False symlink False)
  4592. -merging rev
  4593. -my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
  4594. -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  4595. -(branch merge, don't forget to commit)
  4596. ---------------
  4597. -C a
  4598. -C b
  4599. ---------------
  4600. -
  4601. -created new head
  4602. ---------------
  4603. -test L: R:nm a b W: - 7 get b
  4604. ---------------
  4605. - searching for copies back to rev 1
  4606. - unmatched files in other:
  4607. - b
  4608. - all copies found (* = to merge, ! = divergent):
  4609. - b -> a
  4610. - checking for directory renames
  4611. -resolving manifests
  4612. - overwrite None partial False
  4613. - ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a
  4614. - a: other deleted -> r
  4615. - rev: versions differ -> m
  4616. - b: remote created -> g
  4617. -preserving rev for resolve of rev
  4618. -update: a 1/3 files (33.33%)
  4619. -removing a
  4620. -update: b 2/3 files (66.67%)
  4621. -getting b
  4622. -update: rev 3/3 files (100.00%)
  4623. -picked tool 'python ../merge' for rev (binary False symlink False)
  4624. -merging rev
  4625. -my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
  4626. -1 files updated, 1 files merged, 1 files removed, 0 files unresolved
  4627. -(branch merge, don't forget to commit)
  4628. ---------------
  4629. -M b
  4630. ---------------
  4631. -
  4632. -created new head
  4633. ---------------
  4634. -test L:nm a b R: W: - 8 nothing
  4635. ---------------
  4636. - searching for copies back to rev 1
  4637. - unmatched files in local:
  4638. - b
  4639. - all copies found (* = to merge, ! = divergent):
  4640. - b -> a
  4641. - checking for directory renames
  4642. -resolving manifests
  4643. - overwrite None partial False
  4644. - ancestor 924404dff337 local 02963e448370+ remote 97c705ade336
  4645. - rev: versions differ -> m
  4646. -preserving rev for resolve of rev
  4647. -update: rev 1/1 files (100.00%)
  4648. -picked tool 'python ../merge' for rev (binary False symlink False)
  4649. -merging rev
  4650. -my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
  4651. -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  4652. -(branch merge, don't forget to commit)
  4653. ---------------
  4654. -C b
  4655. ---------------
  4656. -
  4657. -created new head
  4658. ---------------
  4659. -test L:um a b R:um a b W: - 9 do merge with ancestor in a
  4660. ---------------
  4661. - searching for copies back to rev 1
  4662. -resolving manifests
  4663. - overwrite None partial False
  4664. - ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493
  4665. - b: versions differ -> m
  4666. - rev: versions differ -> m
  4667. -preserving b for resolve of b
  4668. -preserving rev for resolve of rev
  4669. -update: b 1/2 files (50.00%)
  4670. -picked tool 'python ../merge' for b (binary False symlink False)
  4671. -merging b
  4672. -my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
  4673. -update: rev 2/2 files (100.00%)
  4674. -picked tool 'python ../merge' for rev (binary False symlink False)
  4675. -merging rev
  4676. -my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
  4677. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4678. -(branch merge, don't forget to commit)
  4679. ---------------
  4680. -M b
  4681. ---------------
  4682. -
  4683. -created new head
  4684. ---------------
  4685. -test L:nm a b R:nm a c W: - 11 get c, keep b
  4686. ---------------
  4687. - searching for copies back to rev 1
  4688. - unmatched files in local:
  4689. - b
  4690. - unmatched files in other:
  4691. - c
  4692. - all copies found (* = to merge, ! = divergent):
  4693. - c -> a !
  4694. - b -> a !
  4695. - checking for directory renames
  4696. - a: divergent renames -> dr
  4697. -resolving manifests
  4698. - overwrite None partial False
  4699. - ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e
  4700. - rev: versions differ -> m
  4701. - c: remote created -> g
  4702. -preserving rev for resolve of rev
  4703. -update: a 1/3 files (33.33%)
  4704. -warning: detected divergent renames of a to:
  4705. - b
  4706. - c
  4707. -update: c 2/3 files (66.67%)
  4708. -getting c
  4709. -update: rev 3/3 files (100.00%)
  4710. -picked tool 'python ../merge' for rev (binary False symlink False)
  4711. -merging rev
  4712. -my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
  4713. -1 files updated, 1 files merged, 0 files removed, 0 files unresolved
  4714. -(branch merge, don't forget to commit)
  4715. ---------------
  4716. -M c
  4717. -C b
  4718. ---------------
  4719. -
  4720. -created new head
  4721. ---------------
  4722. -test L:nc a b R:up b W: - 12 merge b no ancestor
  4723. ---------------
  4724. - searching for copies back to rev 1
  4725. -resolving manifests
  4726. - overwrite None partial False
  4727. - ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7
  4728. - b: versions differ -> m
  4729. - rev: versions differ -> m
  4730. -preserving b for resolve of b
  4731. -preserving rev for resolve of rev
  4732. -update: b 1/2 files (50.00%)
  4733. -picked tool 'python ../merge' for b (binary False symlink False)
  4734. -merging b
  4735. -my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
  4736. -update: rev 2/2 files (100.00%)
  4737. -picked tool 'python ../merge' for rev (binary False symlink False)
  4738. -merging rev
  4739. -my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
  4740. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4741. -(branch merge, don't forget to commit)
  4742. ---------------
  4743. -M b
  4744. -C a
  4745. ---------------
  4746. -
  4747. -created new head
  4748. ---------------
  4749. -test L:up b R:nm a b W: - 13 merge b no ancestor
  4750. ---------------
  4751. - searching for copies back to rev 1
  4752. -resolving manifests
  4753. - overwrite None partial False
  4754. - ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
  4755. - a: other deleted -> r
  4756. - b: versions differ -> m
  4757. - rev: versions differ -> m
  4758. -preserving b for resolve of b
  4759. -preserving rev for resolve of rev
  4760. -update: a 1/3 files (33.33%)
  4761. -removing a
  4762. -update: b 2/3 files (66.67%)
  4763. -picked tool 'python ../merge' for b (binary False symlink False)
  4764. -merging b
  4765. -my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
  4766. -update: rev 3/3 files (100.00%)
  4767. -picked tool 'python ../merge' for rev (binary False symlink False)
  4768. -merging rev
  4769. -my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
  4770. -0 files updated, 2 files merged, 1 files removed, 0 files unresolved
  4771. -(branch merge, don't forget to commit)
  4772. ---------------
  4773. -M b
  4774. ---------------
  4775. -
  4776. -created new head
  4777. ---------------
  4778. -test L:nc a b R:up a b W: - 14 merge b no ancestor
  4779. ---------------
  4780. - searching for copies back to rev 1
  4781. -resolving manifests
  4782. - overwrite None partial False
  4783. - ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
  4784. - a: remote is newer -> g
  4785. - b: versions differ -> m
  4786. - rev: versions differ -> m
  4787. -preserving b for resolve of b
  4788. -preserving rev for resolve of rev
  4789. -update: a 1/3 files (33.33%)
  4790. -getting a
  4791. -update: b 2/3 files (66.67%)
  4792. -picked tool 'python ../merge' for b (binary False symlink False)
  4793. -merging b
  4794. -my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
  4795. -update: rev 3/3 files (100.00%)
  4796. -picked tool 'python ../merge' for rev (binary False symlink False)
  4797. -merging rev
  4798. -my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
  4799. -1 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4800. -(branch merge, don't forget to commit)
  4801. ---------------
  4802. -M a
  4803. -M b
  4804. ---------------
  4805. -
  4806. -created new head
  4807. ---------------
  4808. -test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
  4809. ---------------
  4810. - searching for copies back to rev 1
  4811. -resolving manifests
  4812. - overwrite None partial False
  4813. - ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
  4814. - a: other deleted -> r
  4815. - b: versions differ -> m
  4816. - rev: versions differ -> m
  4817. -preserving b for resolve of b
  4818. -preserving rev for resolve of rev
  4819. -update: a 1/3 files (33.33%)
  4820. -removing a
  4821. -update: b 2/3 files (66.67%)
  4822. -picked tool 'python ../merge' for b (binary False symlink False)
  4823. -merging b
  4824. -my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
  4825. -update: rev 3/3 files (100.00%)
  4826. -picked tool 'python ../merge' for rev (binary False symlink False)
  4827. -merging rev
  4828. -my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
  4829. -0 files updated, 2 files merged, 1 files removed, 0 files unresolved
  4830. -(branch merge, don't forget to commit)
  4831. ---------------
  4832. -M b
  4833. ---------------
  4834. -
  4835. -created new head
  4836. ---------------
  4837. -test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
  4838. ---------------
  4839. - searching for copies back to rev 1
  4840. -resolving manifests
  4841. - overwrite None partial False
  4842. - ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
  4843. - a: remote is newer -> g
  4844. - b: versions differ -> m
  4845. - rev: versions differ -> m
  4846. -preserving b for resolve of b
  4847. -preserving rev for resolve of rev
  4848. -update: a 1/3 files (33.33%)
  4849. -getting a
  4850. -update: b 2/3 files (66.67%)
  4851. -picked tool 'python ../merge' for b (binary False symlink False)
  4852. -merging b
  4853. -my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
  4854. -update: rev 3/3 files (100.00%)
  4855. -picked tool 'python ../merge' for rev (binary False symlink False)
  4856. -merging rev
  4857. -my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
  4858. -1 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4859. -(branch merge, don't forget to commit)
  4860. ---------------
  4861. -M a
  4862. -M b
  4863. ---------------
  4864. -
  4865. -created new head
  4866. ---------------
  4867. -test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
  4868. ---------------
  4869. - searching for copies back to rev 1
  4870. -resolving manifests
  4871. - overwrite None partial False
  4872. - ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24
  4873. - b: versions differ -> m
  4874. - rev: versions differ -> m
  4875. -preserving b for resolve of b
  4876. -preserving rev for resolve of rev
  4877. -update: b 1/2 files (50.00%)
  4878. -picked tool 'python ../merge' for b (binary False symlink False)
  4879. -merging b
  4880. -my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
  4881. -update: rev 2/2 files (100.00%)
  4882. -picked tool 'python ../merge' for rev (binary False symlink False)
  4883. -merging rev
  4884. -my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
  4885. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4886. -(branch merge, don't forget to commit)
  4887. ---------------
  4888. -M b
  4889. -C a
  4890. ---------------
  4891. -
  4892. -created new head
  4893. ---------------
  4894. -test L:nm a b R:up a b W: - 18 merge b no ancestor
  4895. ---------------
  4896. - searching for copies back to rev 1
  4897. -resolving manifests
  4898. - overwrite None partial False
  4899. - ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a
  4900. - b: versions differ -> m
  4901. - rev: versions differ -> m
  4902. -remote changed a which local deleted
  4903. -use (c)hanged version or leave (d)eleted? c
  4904. - a: prompt recreating -> g
  4905. -preserving b for resolve of b
  4906. -preserving rev for resolve of rev
  4907. -update: a 1/3 files (33.33%)
  4908. -getting a
  4909. -update: b 2/3 files (66.67%)
  4910. -picked tool 'python ../merge' for b (binary False symlink False)
  4911. -merging b
  4912. -my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
  4913. -update: rev 3/3 files (100.00%)
  4914. -picked tool 'python ../merge' for rev (binary False symlink False)
  4915. -merging rev
  4916. -my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
  4917. -1 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4918. -(branch merge, don't forget to commit)
  4919. ---------------
  4920. -M a
  4921. -M b
  4922. ---------------
  4923. -
  4924. -created new head
  4925. ---------------
  4926. -test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
  4927. ---------------
  4928. - searching for copies back to rev 1
  4929. -resolving manifests
  4930. - overwrite None partial False
  4931. - ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a
  4932. - local changed a which remote deleted
  4933. -use (c)hanged version or (d)elete? c
  4934. - a: prompt keep -> a
  4935. - b: versions differ -> m
  4936. - rev: versions differ -> m
  4937. -preserving b for resolve of b
  4938. -preserving rev for resolve of rev
  4939. -update: a 1/3 files (33.33%)
  4940. -update: b 2/3 files (66.67%)
  4941. -picked tool 'python ../merge' for b (binary False symlink False)
  4942. -merging b
  4943. -my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
  4944. -update: rev 3/3 files (100.00%)
  4945. -picked tool 'python ../merge' for rev (binary False symlink False)
  4946. -merging rev
  4947. -my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
  4948. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4949. -(branch merge, don't forget to commit)
  4950. ---------------
  4951. -M b
  4952. -C a
  4953. ---------------
  4954. -
  4955. -created new head
  4956. ---------------
  4957. -test L:up a R:um a b W: - 20 merge a and b to b, remove a
  4958. ---------------
  4959. - searching for copies back to rev 1
  4960. - unmatched files in other:
  4961. - b
  4962. - all copies found (* = to merge, ! = divergent):
  4963. - b -> a *
  4964. - checking for directory renames
  4965. -resolving manifests
  4966. - overwrite None partial False
  4967. - ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493
  4968. - rev: versions differ -> m
  4969. - a: remote moved to b -> m
  4970. -preserving a for resolve of b
  4971. -preserving rev for resolve of rev
  4972. -removing a
  4973. -update: a 1/2 files (50.00%)
  4974. -picked tool 'python ../merge' for b (binary False symlink False)
  4975. -merging a and b to b
  4976. -my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
  4977. -update: rev 2/2 files (100.00%)
  4978. -picked tool 'python ../merge' for rev (binary False symlink False)
  4979. -merging rev
  4980. -my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
  4981. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  4982. -(branch merge, don't forget to commit)
  4983. ---------------
  4984. -M b
  4985. - a
  4986. ---------------
  4987. -
  4988. -created new head
  4989. ---------------
  4990. -test L:um a b R:up a W: - 21 merge a and b to b
  4991. ---------------
  4992. - searching for copies back to rev 1
  4993. - unmatched files in local:
  4994. - b
  4995. - all copies found (* = to merge, ! = divergent):
  4996. - b -> a *
  4997. - checking for directory renames
  4998. -resolving manifests
  4999. - overwrite None partial False
  5000. - ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71
  5001. - b: local copied/moved to a -> m
  5002. - rev: versions differ -> m
  5003. -preserving b for resolve of b
  5004. -preserving rev for resolve of rev
  5005. -update: b 1/2 files (50.00%)
  5006. -picked tool 'python ../merge' for b (binary False symlink False)
  5007. -merging b and a to b
  5008. -my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
  5009. -update: rev 2/2 files (100.00%)
  5010. -picked tool 'python ../merge' for rev (binary False symlink False)
  5011. -merging rev
  5012. -my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
  5013. -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  5014. -(branch merge, don't forget to commit)
  5015. ---------------
  5016. -M b
  5017. - a
  5018. ---------------
  5019. -
  5020. -created new head
  5021. ---------------
  5022. -test L:nm a b R:up a c W: - 23 get c, keep b
  5023. ---------------
  5024. - searching for copies back to rev 1
  5025. - unmatched files in local:
  5026. - b
  5027. - unmatched files in other:
  5028. - c
  5029. - all copies found (* = to merge, ! = divergent):
  5030. - b -> a *
  5031. - checking for directory renames
  5032. -resolving manifests
  5033. - overwrite None partial False
  5034. - ancestor 924404dff337 local 02963e448370+ remote 2b958612230f
  5035. - b: local copied/moved to a -> m
  5036. - rev: versions differ -> m
  5037. - c: remote created -> g
  5038. -preserving b for resolve of b
  5039. -preserving rev for resolve of rev
  5040. -update: b 1/3 files (33.33%)
  5041. -picked tool 'python ../merge' for b (binary False symlink False)
  5042. -merging b and a to b
  5043. -my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
  5044. - premerge successful
  5045. -update: c 2/3 files (66.67%)
  5046. -getting c
  5047. -update: rev 3/3 files (100.00%)
  5048. -picked tool 'python ../merge' for rev (binary False symlink False)
  5049. -merging rev
  5050. -my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
  5051. -1 files updated, 2 files merged, 0 files removed, 0 files unresolved
  5052. -(branch merge, don't forget to commit)
  5053. ---------------
  5054. -M b
  5055. - a
  5056. -M c
  5057. ---------------
  5058. -
  5059. +### Abort: timeout after 180 seconds.
  5060. !
  5061. ERROR: /home/rupert/hg-crew-10s/tests/test-mq output changed and returned error code 208
  5062. --- /home/rupert/hg-crew-10s/tests/test-mq.out
  5063. +++ /home/rupert/hg-crew-10s/tests/test-mq.err
  5064. -1,616 +1,2 @@
  5065. -% help
  5066. -mq extension - manage a stack of patches
  5067.  
  5068. -This extension lets you work with a stack of patches in a Mercurial
  5069. -repository. It manages two stacks of patches - all known patches, and applied
  5070. -patches (subset of known patches).
  5071. -
  5072. -Known patches are represented as patch files in the .hg/patches directory.
  5073. -Applied patches are both patch files and changesets.
  5074. -
  5075. -Common tasks (use "hg help command" for more details):
  5076. -
  5077. - prepare repository to work with patches qinit
  5078. - create new patch qnew
  5079. - import existing patch qimport
  5080. -
  5081. - print patch series qseries
  5082. - print applied patches qapplied
  5083. -
  5084. - add known patch to applied stack qpush
  5085. - remove patch from applied stack qpop
  5086. - refresh contents of top applied patch qrefresh
  5087. -
  5088. -By default, mq will automatically use git patches when required to avoid
  5089. -losing file mode changes, copy records, binary files or empty files creations
  5090. -or deletions. This behaviour can be configured with:
  5091. -
  5092. - [mq]
  5093. - git = auto/keep/yes/no
  5094. -
  5095. -If set to 'keep', mq will obey the [diff] section configuration while
  5096. -preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
  5097. -will override the [diff] section and always generate git or regular patches,
  5098. -possibly losing data in the second case.
  5099. -
  5100. -list of commands:
  5101. -
  5102. - qapplied print the patches already applied
  5103. - qclone clone main and patch repository at same time
  5104. - qdelete remove patches from queue
  5105. - qdiff diff of the current patch and subsequent modifications
  5106. - qfinish move applied patches into repository history
  5107. - qfold fold the named patches into the current patch
  5108. - qgoto push or pop patches until named patch is at top of stack
  5109. - qguard set or print guards for a patch
  5110. - qheader print the header of the topmost or specified patch
  5111. - qimport import a patch
  5112. - qnew create a new patch
  5113. - qnext print the name of the next patch
  5114. - qpop pop the current patch off the stack
  5115. - qprev print the name of the previous patch
  5116. - qpush push the next patch onto the stack
  5117. - qrefresh update the current patch
  5118. - qrename rename a patch
  5119. - qselect set or print guarded patches to push
  5120. - qseries print the entire series file
  5121. - qtop print the name of the current patch
  5122. - qunapplied print the patches not yet applied
  5123. - strip strip a revision and all its descendants from the repository
  5124. -
  5125. -use "hg -v help mq" to show aliases and global options
  5126. -adding a
  5127. -updating to branch default
  5128. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5129. -adding b/z
  5130. -% qinit
  5131. -% -R qinit
  5132. -% qinit -c
  5133. -A .hgignore
  5134. -A series
  5135. -% qinit; qinit -c
  5136. - .hgignore:
  5137. -^\.hg
  5138. -^\.mq
  5139. -syntax: glob
  5140. -status
  5141. -guards
  5142. - series:
  5143. -abort: repository already exists!
  5144. -% qinit; <stuff>; qinit -c
  5145. -adding .hg/patches/A
  5146. -adding .hg/patches/B
  5147. -A .hgignore
  5148. -A A
  5149. -A B
  5150. -A series
  5151. - .hgignore:
  5152. -status
  5153. -bleh
  5154. - series:
  5155. -A
  5156. -B
  5157. -% qrefresh
  5158. -foo bar
  5159. -
  5160. -diff -r xa
  5161. ---- a/a
  5162. -+++ b/a
  5163. -@@ -1,1 +1,2 @@
  5164. - a
  5165. -+a
  5166. -% empty qrefresh
  5167. -revision:
  5168. -patch:
  5169. -foo bar
  5170. -
  5171. -working dir diff:
  5172. ---- a/a
  5173. -+++ b/a
  5174. -@@ -1,1 +1,2 @@
  5175. - a
  5176. -+a
  5177. -% qpop
  5178. -popping test.patch
  5179. -patch queue now empty
  5180. -% qpush with dump of tag cache
  5181. -.hg/tags.cache (pre qpush):
  5182. -1
  5183. -
  5184. -applying test.patch
  5185. -now at: test.patch
  5186. -.hg/tags.cache (post qpush):
  5187. -2
  5188. -
  5189. -% pop/push outside repo
  5190. -popping test.patch
  5191. -patch queue now empty
  5192. -applying test.patch
  5193. -now at: test.patch
  5194. -% qrefresh in subdir
  5195. -% pop/push -a in subdir
  5196. -popping test2.patch
  5197. -popping test.patch
  5198. -patch queue now empty
  5199. -applying test.patch
  5200. -applying test2.patch
  5201. -now at: test2.patch
  5202. -% qseries
  5203. -test.patch
  5204. -test2.patch
  5205. -0 A test.patch: f...
  5206. -1 A test2.patch:
  5207. -popping test2.patch
  5208. -now at: test.patch
  5209. -0 A test.patch: foo bar
  5210. -1 U test2.patch:
  5211. -applying test2.patch
  5212. -now at: test2.patch
  5213. -% qapplied
  5214. -test.patch
  5215. -test2.patch
  5216. -% qtop
  5217. -test2.patch
  5218. -% prev
  5219. -test.patch
  5220. -% next
  5221. -all patches applied
  5222. -popping test2.patch
  5223. -now at: test.patch
  5224. -% commit should fail
  5225. -abort: cannot commit over an applied mq patch
  5226. -% push should fail
  5227. -pushing to ../../k
  5228. -abort: source has mq patches applied
  5229. -% import should fail
  5230. -abort: cannot import over an applied patch
  5231. -% import --no-commit should succeed
  5232. -applying ../../import.diff
  5233. -M a
  5234. -% qunapplied
  5235. -test2.patch
  5236. -% qpush/qpop with index
  5237. -applying test2.patch
  5238. -now at: test2.patch
  5239. -popping test2.patch
  5240. -popping test1b.patch
  5241. -now at: test.patch
  5242. -applying test1b.patch
  5243. -now at: test1b.patch
  5244. -applying test2.patch
  5245. -now at: test2.patch
  5246. -popping test2.patch
  5247. -now at: test1b.patch
  5248. -popping test1b.patch
  5249. -now at: test.patch
  5250. -applying test1b.patch
  5251. -applying test2.patch
  5252. -now at: test2.patch
  5253. -% pop, qapplied, qunapplied
  5254. -0 A test.patch
  5255. -1 A test1b.patch
  5256. -2 A test2.patch
  5257. -% qapplied -1 test.patch
  5258. -only one patch applied
  5259. -% qapplied -1 test1b.patch
  5260. -test.patch
  5261. -% qapplied -1 test2.patch
  5262. -test1b.patch
  5263. -% qapplied -1
  5264. -test1b.patch
  5265. -% qapplied
  5266. -test.patch
  5267. -test1b.patch
  5268. -test2.patch
  5269. -% qapplied test1b.patch
  5270. -test.patch
  5271. -test1b.patch
  5272. -% qunapplied -1
  5273. -all patches applied
  5274. -% qunapplied
  5275. -% popping
  5276. -popping test2.patch
  5277. -now at: test1b.patch
  5278. -% qunapplied -1
  5279. -test2.patch
  5280. -% qunapplied
  5281. -test2.patch
  5282. -% qunapplied test2.patch
  5283. -% qunapplied -1 test2.patch
  5284. -all patches applied
  5285. -% popping -a
  5286. -popping test1b.patch
  5287. -popping test.patch
  5288. -patch queue now empty
  5289. -% qapplied
  5290. -% qapplied -1
  5291. -no patches applied
  5292. -applying test.patch
  5293. -now at: test.patch
  5294. -% push should succeed
  5295. -popping test.patch
  5296. -patch queue now empty
  5297. -pushing to ../../k
  5298. -searching for changes
  5299. -adding changesets
  5300. -adding manifests
  5301. -adding file changes
  5302. -added 1 changesets with 1 changes to 1 files
  5303. -% qpush/qpop error codes
  5304. -applying test.patch
  5305. -applying test1b.patch
  5306. -applying test2.patch
  5307. -now at: test2.patch
  5308. - % pops all patches and succeeds
  5309. -popping test2.patch
  5310. -popping test1b.patch
  5311. -popping test.patch
  5312. -patch queue now empty
  5313. - qpop -a succeeds
  5314. - % does nothing and succeeds
  5315. -no patches applied
  5316. - qpop -a succeeds
  5317. - % fails - nothing else to pop
  5318. -no patches applied
  5319. - qpop fails
  5320. - % pushes a patch and succeeds
  5321. -applying test.patch
  5322. -now at: test.patch
  5323. - qpush succeeds
  5324. - % pops a patch and succeeds
  5325. -popping test.patch
  5326. -patch queue now empty
  5327. - qpop succeeds
  5328. - % pushes up to test1b.patch and succeeds
  5329. -applying test.patch
  5330. -applying test1b.patch
  5331. -now at: test1b.patch
  5332. - qpush test1b.patch succeeds
  5333. - % does nothing and succeeds
  5334. -qpush: test1b.patch is already at the top
  5335. - qpush test1b.patch succeeds
  5336. - % does nothing and succeeds
  5337. -qpop: test1b.patch is already at the top
  5338. - qpop test1b.patch succeeds
  5339. - % fails - can't push to this patch
  5340. -abort: cannot push to a previous patch: test.patch
  5341. - qpush test.patch fails
  5342. - % fails - can't pop to this patch
  5343. -abort: patch test2.patch is not applied
  5344. - qpop test2.patch fails
  5345. - % pops up to test.patch and succeeds
  5346. -popping test1b.patch
  5347. -now at: test.patch
  5348. - qpop test.patch succeeds
  5349. - % pushes all patches and succeeds
  5350. -applying test1b.patch
  5351. -applying test2.patch
  5352. -now at: test2.patch
  5353. - qpush -a succeeds
  5354. - % does nothing and succeeds
  5355. -all patches are currently applied
  5356. - qpush -a succeeds
  5357. - % fails - nothing else to push
  5358. -patch series already fully applied
  5359. - qpush fails
  5360. - % does nothing and succeeds
  5361. -qpush: test2.patch is already at the top
  5362. - qpush test2.patch succeeds
  5363. -% strip
  5364. -adding x
  5365. -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  5366. -saving bundle to
  5367. -adding changesets
  5368. -adding manifests
  5369. -adding file changes
  5370. -added 1 changesets with 1 changes to 1 files
  5371. -(run 'hg update' to get a working copy)
  5372. -% strip with local changes, should complain
  5373. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5374. -abort: local changes found
  5375. -% --force strip with local changes
  5376. -0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  5377. -saving bundle to
  5378. -% cd b; hg qrefresh
  5379. -adding a
  5380. -foo
  5381. -
  5382. -diff -r cb9a9f314b8b a
  5383. ---- a/a
  5384. -+++ b/a
  5385. -@@ -1,1 +1,2 @@
  5386. - a
  5387. -+a
  5388. -diff -r cb9a9f314b8b b/f
  5389. ---- /dev/null
  5390. -+++ b/b/f
  5391. -@@ -0,0 +1,1 @@
  5392. -+f
  5393. -% hg qrefresh .
  5394. -foo
  5395. -
  5396. -diff -r cb9a9f314b8b b/f
  5397. ---- /dev/null
  5398. -+++ b/b/f
  5399. -@@ -0,0 +1,1 @@
  5400. -+f
  5401. -M a
  5402. -% qpush failure
  5403. -popping bar
  5404. -popping foo
  5405. -patch queue now empty
  5406. -applying foo
  5407. -applying bar
  5408. -file foo already exists
  5409. -1 out of 1 hunks FAILED -- saving rejects to file foo.rej
  5410. -patch failed, unable to continue (try -v)
  5411. -patch failed, rejects left in working dir
  5412. -errors during apply, please fix and refresh bar
  5413. -? foo
  5414. -? foo.rej
  5415. -% mq tags
  5416. -0 qparent
  5417. -1 qbase foo
  5418. -2 qtip bar tip
  5419. -% bad node in status
  5420. -popping bar
  5421. -now at: foo
  5422. -changeset: 0:cb9a9f314b8b
  5423. -mq status file refers to unknown node
  5424. -tag: tip
  5425. -user: test
  5426. -date: Thu Jan 01 00:00:00 1970 +0000
  5427. -summary: a
  5428. -
  5429. -mq status file refers to unknown node
  5430. -default 0:cb9a9f314b8b
  5431. -abort: trying to pop unknown node
  5432. -new file
  5433. -
  5434. -diff --git a/new b/new
  5435. -new file mode 100755
  5436. ---- /dev/null
  5437. -+++ b/new
  5438. -@@ -0,0 +1,1 @@
  5439. -+foo
  5440. -copy file
  5441. -
  5442. -diff --git a/new b/copy
  5443. -copy from new
  5444. -copy to copy
  5445. -popping copy
  5446. -now at: new
  5447. -applying copy
  5448. -now at: copy
  5449. -diff --git a/new b/copy
  5450. -copy from new
  5451. -copy to copy
  5452. -diff --git a/new b/copy
  5453. -copy from new
  5454. -copy to copy
  5455. -% test file addition in slow path
  5456. -1 files updated, 0 files merged, 2 files removed, 0 files unresolved
  5457. -created new head
  5458. -2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  5459. -adding branch
  5460. -adding changesets
  5461. -adding manifests
  5462. -adding file changes
  5463. -added 1 changesets with 1 changes to 1 files
  5464. -diff --git a/bar b/bar
  5465. -new file mode 100644
  5466. ---- /dev/null
  5467. -+++ b/bar
  5468. -@@ -0,0 +1,1 @@
  5469. -+bar
  5470. -diff --git a/foo b/baz
  5471. -rename from foo
  5472. -rename to baz
  5473. -2 baz (foo)
  5474. -diff --git a/bar b/bar
  5475. -new file mode 100644
  5476. ---- /dev/null
  5477. -+++ b/bar
  5478. -@@ -0,0 +1,1 @@
  5479. -+bar
  5480. -diff --git a/foo b/baz
  5481. -rename from foo
  5482. -rename to baz
  5483. -2 baz (foo)
  5484. -diff --git a/bar b/bar
  5485. -diff --git a/foo b/baz
  5486. -% test file move chains in the slow path
  5487. -1 files updated, 0 files merged, 2 files removed, 0 files unresolved
  5488. -2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  5489. -adding branch
  5490. -adding changesets
  5491. -adding manifests
  5492. -adding file changes
  5493. -added 1 changesets with 1 changes to 1 files
  5494. -diff --git a/foo b/bleh
  5495. -rename from foo
  5496. -rename to bleh
  5497. -diff --git a/quux b/quux
  5498. -new file mode 100644
  5499. ---- /dev/null
  5500. -+++ b/quux
  5501. -@@ -0,0 +1,1 @@
  5502. -+bar
  5503. -3 bleh (foo)
  5504. -diff --git a/foo b/barney
  5505. -rename from foo
  5506. -rename to barney
  5507. -diff --git a/fred b/fred
  5508. -new file mode 100644
  5509. ---- /dev/null
  5510. -+++ b/fred
  5511. -@@ -0,0 +1,1 @@
  5512. -+bar
  5513. -3 barney (foo)
  5514. -% refresh omitting an added file
  5515. -C newfile
  5516. -A newfile
  5517. -popping baz
  5518. -now at: bar
  5519. -% create a git patch
  5520. -diff --git a/alexander b/alexander
  5521. -% create a git binary patch
  5522. -8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
  5523. -diff --git a/bucephalus b/bucephalus
  5524. -% check binary patches can be popped and pushed
  5525. -popping addbucephalus
  5526. -now at: addalexander
  5527. -applying addbucephalus
  5528. -now at: addbucephalus
  5529. -8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
  5530. -% strip again
  5531. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5532. -created new head
  5533. -merging foo
  5534. -0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  5535. -(branch merge, don't forget to commit)
  5536. -changeset: 3:99615015637b
  5537. -tag: tip
  5538. -parent: 2:20cbbe65cff7
  5539. -parent: 1:d2871fc282d4
  5540. -user: test
  5541. -date: Thu Jan 01 00:00:00 1970 +0000
  5542. -summary: merge
  5543. -
  5544. -changeset: 2:20cbbe65cff7
  5545. -parent: 0:53245c60e682
  5546. -user: test
  5547. -date: Thu Jan 01 00:00:00 1970 +0000
  5548. -summary: change foo 2
  5549. -
  5550. -changeset: 1:d2871fc282d4
  5551. -user: test
  5552. -date: Thu Jan 01 00:00:00 1970 +0000
  5553. -summary: change foo 1
  5554. -
  5555. -changeset: 0:53245c60e682
  5556. -user: test
  5557. -date: Thu Jan 01 00:00:00 1970 +0000
  5558. -summary: add foo
  5559. -
  5560. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5561. -saving bundle to
  5562. -saving bundle to
  5563. -adding branch
  5564. -adding changesets
  5565. -adding manifests
  5566. -adding file changes
  5567. -added 1 changesets with 1 changes to 1 files
  5568. -changeset: 1:20cbbe65cff7
  5569. -tag: tip
  5570. -user: test
  5571. -date: Thu Jan 01 00:00:00 1970 +0000
  5572. -summary: change foo 2
  5573. -
  5574. -changeset: 0:53245c60e682
  5575. -user: test
  5576. -date: Thu Jan 01 00:00:00 1970 +0000
  5577. -summary: add foo
  5578. -
  5579. -% qclone
  5580. -abort: versioned patch repository not found (see qinit -c)
  5581. -adding .hg/patches/patch1
  5582. -main repo:
  5583. - rev 1: change foo
  5584. - rev 0: add foo
  5585. -patch repo:
  5586. - rev 0: checkpoint
  5587. -updating to branch default
  5588. -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5589. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5590. -main repo:
  5591. - rev 0: add foo
  5592. -patch repo:
  5593. - rev 0: checkpoint
  5594. -popping patch1
  5595. -patch queue now empty
  5596. -main repo:
  5597. - rev 0: add foo
  5598. -patch repo:
  5599. - rev 0: checkpoint
  5600. -updating to branch default
  5601. -3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5602. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5603. -main repo:
  5604. - rev 0: add foo
  5605. -patch repo:
  5606. - rev 0: checkpoint
  5607. -% test applying on an empty file (issue 1033)
  5608. -adding a
  5609. -popping changea
  5610. -patch queue now empty
  5611. -applying changea
  5612. -now at: changea
  5613. -% test qpush with --force, issue1087
  5614. -adding bye.txt
  5615. -adding hello.txt
  5616. -popping empty
  5617. -patch queue now empty
  5618. -% qpush should fail, local changes
  5619. -abort: local changes found, refresh first
  5620. -% apply force, should not discard changes with empty patch
  5621. -applying empty
  5622. -patch empty is empty
  5623. -now at: empty
  5624. -diff -r bf5fc3f07a0a hello.txt
  5625. ---- a/hello.txt
  5626. -+++ b/hello.txt
  5627. -@@ -1,1 +1,2 @@
  5628. - hello
  5629. -+world
  5630. -diff -r 9ecee4f634e3 hello.txt
  5631. ---- a/hello.txt
  5632. -+++ b/hello.txt
  5633. -@@ -1,1 +1,2 @@
  5634. - hello
  5635. -+world
  5636. -changeset: 1:bf5fc3f07a0a
  5637. -tag: qtip
  5638. -tag: tip
  5639. -tag: empty
  5640. -tag: qbase
  5641. -user: test
  5642. -date: Thu Jan 01 00:00:00 1970 +0000
  5643. -summary: imported patch empty
  5644. -
  5645. -
  5646. -popping empty
  5647. -patch queue now empty
  5648. -% qpush should fail, local changes
  5649. -abort: local changes found, refresh first
  5650. -% apply force, should discard changes in hello, but not bye
  5651. -applying empty
  5652. -now at: empty
  5653. -M bye.txt
  5654. -diff -r ba252371dbc1 bye.txt
  5655. ---- a/bye.txt
  5656. -+++ b/bye.txt
  5657. -@@ -1,1 +1,2 @@
  5658. - bye
  5659. -+universe
  5660. -diff -r 9ecee4f634e3 bye.txt
  5661. ---- a/bye.txt
  5662. -+++ b/bye.txt
  5663. -@@ -1,1 +1,2 @@
  5664. - bye
  5665. -+universe
  5666. -diff -r 9ecee4f634e3 hello.txt
  5667. ---- a/hello.txt
  5668. -+++ b/hello.txt
  5669. -@@ -1,1 +1,3 @@
  5670. - hello
  5671. -+world
  5672. -+universe
  5673. -% test popping revisions not in working dir ancestry
  5674. -0 A empty
  5675. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5676. -popping empty
  5677. -patch queue now empty
  5678. -% test popping must remove files added in subdirectories first
  5679. -popping rename-dir
  5680. -patch queue now empty
  5681. +### Abort: timeout after 180 seconds.
  5682. !..................
  5683. Skipped test-inotify-issue1542: missing feature: inotify extension support
  5684. Skipped test-no-symlinks: system supports symbolic links
  5685. Skipped test-convert-darcs: missing feature: darcs client
  5686. Skipped test-convert-tla: missing feature: GNU Arch tla client
  5687. Skipped test-convert-baz: missing feature: GNU Arch baz client
  5688. Skipped test-convert-bzr: missing feature: Canonical's Bazaar client
  5689. Skipped test-convert-mtn: missing feature: monotone client (> 0.31)
  5690. Skipped test-highlight: missing feature: Pygments source highlighting library
  5691. Skipped test-inotify-issue1556: missing feature: inotify extension support
  5692. Skipped test-convert-bzr-ghosts: missing feature: Canonical's Bazaar client
  5693. Skipped test-inotify-dirty-dirstate: missing feature: inotify extension support
  5694. Skipped test-casefolding: missing feature: case insensitive file system
  5695. Skipped test-convert-bzr-directories: missing feature: Canonical's Bazaar client
  5696. Skipped test-convert-p4-filetypes: missing feature: Perforce server and client
  5697. Skipped test-inotify-debuginotify: missing feature: inotify extension support
  5698. Skipped test-convert-bzr-114: missing feature: Canonical's Bazaar client >= 1.14
  5699. Skipped test-convert-p4: missing feature: Perforce server and client
  5700. Skipped test-inotify: missing feature: inotify extension support
  5701. Skipped test-inotify-lookup: missing feature: inotify extension support
  5702. Skipped test-convert-bzr-treeroot: missing feature: Canonical's Bazaar client
  5703. Skipped test-inotify-issue1371: missing feature: inotify extension support
  5704. Skipped test-convert-bzr-merges: missing feature: Canonical's Bazaar client
  5705. Skipped test-inotify-issue1208: missing feature: inotify extension support
  5706. Failed test-extension: output changed
  5707. Failed test-gendoc: output changed and returned error code 1
  5708. Failed test-bundle-r: output changed and returned error code 208
  5709. Failed test-http-proxy: output changed
  5710. Failed test-rebase-parameters: output changed and returned error code 208
  5711. Failed test-static-http: output changed
  5712. Failed test-mq-header-from: output changed and returned error code 208
  5713. Failed test-bad-pull: output changed
  5714. Failed test-mq-header-date: output changed and returned error code 208
  5715. Failed test-command-template: output changed and returned error code 208
  5716. Failed test-merge-default: output changed and returned error code 1
  5717. Failed test-bisect: output changed and returned error code 208
  5718. Failed test-keyword: output changed and returned error code 208
  5719. Failed test-rename-merge2: output changed and returned error code 208
  5720. Failed test-import: output changed and returned error code 208
  5721. Failed test-mq: output changed and returned error code 208
  5722. # Ran 368 tests, 23 skipped, 16 failed.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!