comparison tests/test-push-race.t @ 40147:58ebf5083843

push: add "remote" to 'repository changed while pushing' messages (issue5971) Differential Revision: https://phab.mercurial-scm.org/D4933
author Taapas Agrawal <taapas2897@gmail.com>
date Thu, 11 Oct 2018 03:38:23 +0530
parents 5abc47d4ca6b
children d3d52cc91e83
comparison
equal deleted inserted replaced
40146:adfe4bb53a47 40147:58ebf5083843
212 pushing to ssh://user@dummy/server 212 pushing to ssh://user@dummy/server
213 searching for changes 213 searching for changes
214 wrote ready: $TESTTMP/readyfile 214 wrote ready: $TESTTMP/readyfile
215 waiting on: $TESTTMP/watchfile 215 waiting on: $TESTTMP/watchfile
216 abort: push failed: 216 abort: push failed:
217 'repository changed while pushing - please try again' 217 'remote repository changed while pushing - please try again'
218 218
219 $ hg -R server graph 219 $ hg -R server graph
220 o 98217d5a1659 C-A (default) 220 o 98217d5a1659 C-A (default)
221 | 221 |
222 @ 842e2fac6304 C-ROOT (default) 222 @ 842e2fac6304 C-ROOT (default)
301 pushing to ssh://user@dummy/server 301 pushing to ssh://user@dummy/server
302 searching for changes 302 searching for changes
303 wrote ready: $TESTTMP/readyfile 303 wrote ready: $TESTTMP/readyfile
304 waiting on: $TESTTMP/watchfile 304 waiting on: $TESTTMP/watchfile
305 abort: push failed: 305 abort: push failed:
306 'repository changed while pushing - please try again' 306 'remote repository changed while pushing - please try again'
307 307
308 $ hg -R server graph 308 $ hg -R server graph
309 o 51c544a58128 C-C (default) 309 o 51c544a58128 C-C (default)
310 | 310 |
311 o 98217d5a1659 C-A (default) 311 o 98217d5a1659 C-A (default)
449 pushing to ssh://user@dummy/server 449 pushing to ssh://user@dummy/server
450 searching for changes 450 searching for changes
451 wrote ready: $TESTTMP/readyfile 451 wrote ready: $TESTTMP/readyfile
452 waiting on: $TESTTMP/watchfile 452 waiting on: $TESTTMP/watchfile
453 abort: push failed: 453 abort: push failed:
454 'repository changed while pushing - please try again' 454 'remote repository changed while pushing - please try again'
455 455
456 $ hg -R server graph 456 $ hg -R server graph
457 o d603e2c0cdd7 C-E (default) 457 o d603e2c0cdd7 C-E (default)
458 | 458 |
459 | o 51c544a58128 C-C (default) 459 | o 51c544a58128 C-C (default)
612 pushing to ssh://user@dummy/server 612 pushing to ssh://user@dummy/server
613 searching for changes 613 searching for changes
614 wrote ready: $TESTTMP/readyfile 614 wrote ready: $TESTTMP/readyfile
615 waiting on: $TESTTMP/watchfile 615 waiting on: $TESTTMP/watchfile
616 abort: push failed: 616 abort: push failed:
617 'repository changed while pushing - please try again' 617 'remote repository changed while pushing - please try again'
618 618
619 $ hg -R server graph 619 $ hg -R server graph
620 o 75d69cba5402 C-G (default) 620 o 75d69cba5402 C-G (default)
621 | 621 |
622 o d9e379a8c432 C-F (default) 622 o d9e379a8c432 C-F (default)
787 pushing to ssh://user@dummy/server 787 pushing to ssh://user@dummy/server
788 searching for changes 788 searching for changes
789 wrote ready: $TESTTMP/readyfile 789 wrote ready: $TESTTMP/readyfile
790 waiting on: $TESTTMP/watchfile 790 waiting on: $TESTTMP/watchfile
791 abort: push failed: 791 abort: push failed:
792 'repository changed while pushing - please try again' 792 'remote repository changed while pushing - please try again'
793 793
794 $ hg -R server graph 794 $ hg -R server graph
795 o b35ed749f288 C-I (my-second-test-branch) 795 o b35ed749f288 C-I (my-second-test-branch)
796 | 796 |
797 o 75d69cba5402 C-G (default) 797 o 75d69cba5402 C-G (default)
975 pushing to ssh://user@dummy/server 975 pushing to ssh://user@dummy/server
976 searching for changes 976 searching for changes
977 wrote ready: $TESTTMP/readyfile 977 wrote ready: $TESTTMP/readyfile
978 waiting on: $TESTTMP/watchfile 978 waiting on: $TESTTMP/watchfile
979 abort: push failed: 979 abort: push failed:
980 'repository changed while pushing - please try again' 980 'remote repository changed while pushing - please try again'
981 981
982 $ hg -R server graph 982 $ hg -R server graph
983 o be705100c623 C-K (default) 983 o be705100c623 C-K (default)
984 |\ 984 |\
985 | o d603e2c0cdd7 C-E (default) 985 | o d603e2c0cdd7 C-E (default)
1111 pushing to ssh://user@dummy/server 1111 pushing to ssh://user@dummy/server
1112 searching for changes 1112 searching for changes
1113 wrote ready: $TESTTMP/readyfile 1113 wrote ready: $TESTTMP/readyfile
1114 waiting on: $TESTTMP/watchfile 1114 waiting on: $TESTTMP/watchfile
1115 abort: push failed: 1115 abort: push failed:
1116 'repository changed while pushing - please try again' 1116 'remote repository changed while pushing - please try again'
1117 1117
1118 $ hg -R server graph 1118 $ hg -R server graph
1119 o 6fd3090135df C-M (default) 1119 o 6fd3090135df C-M (default)
1120 | 1120 |
1121 o be705100c623 C-K (default) 1121 o be705100c623 C-K (default)
1283 pushing to ssh://user@dummy/server 1283 pushing to ssh://user@dummy/server
1284 searching for changes 1284 searching for changes
1285 wrote ready: $TESTTMP/readyfile 1285 wrote ready: $TESTTMP/readyfile
1286 waiting on: $TESTTMP/watchfile 1286 waiting on: $TESTTMP/watchfile
1287 abort: push failed: 1287 abort: push failed:
1288 'repository changed while pushing - please try again' 1288 'remote repository changed while pushing - please try again'
1289 1289
1290 $ hg -R server graph 1290 $ hg -R server graph
1291 o 1b58ee3f79e5 C-P (default) 1291 o 1b58ee3f79e5 C-P (default)
1292 | 1292 |
1293 o d0a85b2252a9 C-O (other) 1293 o d0a85b2252a9 C-O (other)
1456 pushing to ssh://user@dummy/server 1456 pushing to ssh://user@dummy/server
1457 searching for changes 1457 searching for changes
1458 wrote ready: $TESTTMP/readyfile 1458 wrote ready: $TESTTMP/readyfile
1459 waiting on: $TESTTMP/watchfile 1459 waiting on: $TESTTMP/watchfile
1460 abort: push failed: 1460 abort: push failed:
1461 'repository changed while pushing - please try again' 1461 'remote repository changed while pushing - please try again'
1462 1462
1463 $ hg -R server graph 1463 $ hg -R server graph
1464 o de7b9e2ba3f6 C-R (other) 1464 o de7b9e2ba3f6 C-R (other)
1465 | 1465 |
1466 o 1b58ee3f79e5 C-P (default) 1466 o 1b58ee3f79e5 C-P (default)
1632 pushing to ssh://user@dummy/server 1632 pushing to ssh://user@dummy/server
1633 searching for changes 1633 searching for changes
1634 wrote ready: $TESTTMP/readyfile 1634 wrote ready: $TESTTMP/readyfile
1635 waiting on: $TESTTMP/watchfile 1635 waiting on: $TESTTMP/watchfile
1636 abort: push failed: 1636 abort: push failed:
1637 'repository changed while pushing - please try again' 1637 'remote repository changed while pushing - please try again'
1638 1638
1639 $ hg -R server debugobsolete 1639 $ hg -R server debugobsolete
1640 $ hg -R server graph 1640 $ hg -R server graph
1641 o a98a47d8b85b C-U (default) 1641 o a98a47d8b85b C-U (default)
1642 | 1642 |
1832 pushing to ssh://user@dummy/server 1832 pushing to ssh://user@dummy/server
1833 searching for changes 1833 searching for changes
1834 wrote ready: $TESTTMP/readyfile 1834 wrote ready: $TESTTMP/readyfile
1835 waiting on: $TESTTMP/watchfile 1835 waiting on: $TESTTMP/watchfile
1836 abort: push failed: 1836 abort: push failed:
1837 'repository changed while pushing - please try again' 1837 'remote repository changed while pushing - please try again'
1838 1838
1839 $ hg -R server debugobsolete 1839 $ hg -R server debugobsolete
1840 b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1840 b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1841 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1841 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1842 $ hg -R server graph --hidden 1842 $ hg -R server graph --hidden