Mercurial > hg
changeset 32634:8d10e21e3b57
test: add a push race case where racing push create a new named branch
This is the mirror case from the previos one. We check case where the raced
push update a head while the racing push create a new named branch as a
children of that updated head.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 27 May 2017 22:26:35 +0200 |
| parents | b01bfa5abbfe |
| children | 32c80d07952b |
| files | tests/test-push-race.t |
| diffstat | 1 files changed, 124 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-push-race.t Sat May 27 22:26:16 2017 +0200 +++ b/tests/test-push-race.t Sat May 27 22:26:35 2017 +0200 @@ -501,3 +501,127 @@ |/ @ 842e2fac6304 C-ROOT (default) + +pushing touching different named branch (same topo): old branch raced +--------------------------------------------------------------------- + +Pushing two children on the same head, one is a different named branch + +# a (raced, default-branch) +# | +# | b (new branch) +# |/ +# * (default-branch) + +(resync-all) + + $ hg -R ./server pull ./client-racy + pulling from ./client-racy + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads .' to see heads, 'hg merge' to merge) + $ hg -R ./client-other pull + pulling from ssh://user@dummy/server + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads .' to see heads, 'hg merge' to merge) + $ hg -R ./client-racy pull + pulling from ssh://user@dummy/server + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads) + + $ hg -R server graph + o 833be552cfe6 C-H (my-first-test-branch) + | + | o 75d69cba5402 C-G (default) + |/ + o d9e379a8c432 C-F (default) + | + o 51c544a58128 C-C (default) + | + | o d603e2c0cdd7 C-E (default) + |/ + o 98217d5a1659 C-A (default) + | + | o 59e76faf78bd C-D (default) + | | + | o a9149a1428e2 C-B (default) + |/ + @ 842e2fac6304 C-ROOT (default) + + +Creating changesets + +(new named branch from one head) + + $ hg -R client-other/ up 'desc("C-G")' + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo aaa >> client-other/a + $ hg -R client-other/ branch my-second-test-branch + marked working directory as branch my-second-test-branch + $ hg -R client-other/ commit -m "C-I" + +(children "updating" that same head) + + $ hg -R client-racy/ up 'desc("C-G")' + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo bbb >> client-racy/a + $ hg -R client-racy/ commit -m "C-J" + +Pushing + + $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & + + $ waiton $TESTTMP/readyfile + + $ hg -R client-other push -fr 'tip' --new-branch + pushing to ssh://user@dummy/server + searching for changes + remote: adding changesets + remote: adding manifests + remote: adding file changes + remote: added 1 changesets with 1 changes to 1 files + + $ release $TESTTMP/watchfile + +Check the result of the push + + $ cat ./push-log + pushing to ssh://user@dummy/server + searching for changes + wrote ready: $TESTTMP/readyfile + waiting on: $TESTTMP/watchfile + abort: push failed: + 'repository changed while pushing - please try again' + + $ hg -R server graph + o b35ed749f288 C-I (my-second-test-branch) + | + o 75d69cba5402 C-G (default) + | + | o 833be552cfe6 C-H (my-first-test-branch) + |/ + o d9e379a8c432 C-F (default) + | + o 51c544a58128 C-C (default) + | + | o d603e2c0cdd7 C-E (default) + |/ + o 98217d5a1659 C-A (default) + | + | o 59e76faf78bd C-D (default) + | | + | o a9149a1428e2 C-B (default) + |/ + @ 842e2fac6304 C-ROOT (default) +