Mercurial > hg
annotate tests/test-push-race.t @ 41163:0101a35deae2
phabricator: warn if unable to amend, instead of aborting after posting
There was a divergence in behavior here between obsolete and strip based
amending. I first noticed the abort when testing outside of the test harness,
but then had trouble recreating it here after reverting the code changes. It
turns out, strip based amend was successfully amending the public commit after
it was posted! It looks like the protection is in the `commit --amend` command,
not in the underlying code that it calls.
I considered doing a preflight check and aborting. But the locks are only
acquired at the end, if amending, and this is too large a section of code to be
wrapped in a maybe-it's-held-or-not context manager for my tastes.
Additionally, some people do post-push reviews, and amending is the default
behavior, so they shouldn't see a misleading error message.
The lack of a 'Differential Revision' entry in the commit message breaks a
{phabreview} test, so it had to be partially conditionalized.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 05 Jan 2019 15:20:33 -0500 |
parents | d3d52cc91e83 |
children | 34a46d48d24e |
rev | line source |
---|---|
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 ============================================================================================ |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 Test cases where there are race condition between two clients pushing to the same repository |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 ============================================================================================ |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 This file tests cases where two clients push to a server at the same time. The |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 "raced" client is done preparing it push bundle when the "racing" client |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 perform its push. The "raced" client starts its actual push after the "racing" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 client push is fully complete. |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 A set of extension and shell functions ensures this scheduling. |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 $ cat >> delaypush.py << EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 > """small extension orchestrate push race |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 > Client with the extensions will create a file when ready and get stuck until |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 > a file is created.""" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 > import errno |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 > import os |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 > import time |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 > from mercurial import ( |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 > exchange, |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 > extensions, |
34767
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
25 > registrar, |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
26 > ) |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
27 > |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
28 > configtable = {} |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
29 > configitem = registrar.configitem(configtable) |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
30 > |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
31 > configitem(b'delaypush', b'ready-path', |
34767
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
32 > default=None, |
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
33 > ) |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
34 > configitem(b'delaypush', b'release-path', |
34767
6338e23c887d
configitems: register the test config in 'test-push-race.t'
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
35 > default=None, |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 > ) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 > def delaypush(orig, pushop): |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 > # notify we are done preparing |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
40 > ui = pushop.repo.ui |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
41 > readypath = ui.config(b'delaypush', b'ready-path') |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 > if readypath is not None: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 > with open(readypath, 'w') as r: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 > r.write('foo') |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
45 > ui.status(b'wrote ready: %s\n' % readypath) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 > # now wait for the other process to be done |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
47 > watchpath = ui.config(b'delaypush', b'release-path') |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 > if watchpath is not None: |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
49 > ui.status(b'waiting on: %s\n' % watchpath) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 > limit = 100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 > while 0 < limit and not os.path.exists(watchpath): |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 > limit -= 1 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 > time.sleep(0.1) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 > if limit <= 0: |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
55 > ui.warn(b'exiting without watchfile: %s' % watchpath) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 > else: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 > # delete the file at the end of the push |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 > def delete(): |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 > try: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 > os.unlink(watchpath) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 > except OSError as exc: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 > if exc.errno != errno.ENOENT: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 > raise |
34507
30ae924a9e00
test-push-race: use 'ui.atexit' instead of python's 'atexit'
Saurabh Singh <singhsrb@fb.com>
parents:
33773
diff
changeset
|
64 > ui.atexit(delete) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 > return orig(pushop) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
66 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
67 > def uisetup(ui): |
40870
d3d52cc91e83
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
40147
diff
changeset
|
68 > extensions.wrapfunction(exchange, b'_pushbundle2', delaypush) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 $ waiton () { |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 > # wait for a file to be created (then delete it) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 > count=100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 > while [ ! -f $1 ] ; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 > do |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 > sleep 0.1; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 > count=`expr $count - 1`; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 > if [ $count -lt 0 ]; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 > then |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 > break |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
81 > fi; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 > done |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 > [ -f $1 ] || echo "ready file still missing: $1" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
84 > rm -f $1 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 > } |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 $ release () { |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 > # create a file and wait for it be deleted |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 > count=100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
90 > touch $1 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 > while [ -f $1 ] ; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 > do |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
93 > sleep 0.1; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 > count=`expr $count - 1`; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
95 > if [ $count -lt 0 ]; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 > then |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 > break |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
98 > fi; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
99 > done |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
100 > [ ! -f $1 ] || echo "delay file still exist: $1" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 > } |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
102 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
103 $ cat >> $HGRCPATH << EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
104 > [ui] |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39480
diff
changeset
|
105 > ssh = "$PYTHON" "$TESTDIR/dummyssh" |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
106 > # simplify output |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
107 > logtemplate = {node|short} {desc} ({branch}) |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
108 > [phases] |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
109 > publish = no |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
110 > [experimental] |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34767
diff
changeset
|
111 > evolution=true |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
112 > [alias] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
113 > graph = log -G --rev 'sort(all(), "topo")' |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
114 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
115 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
116 We tests multiple cases: |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
117 * strict: no race detected, |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
118 * unrelated: race on unrelated heads are allowed. |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
119 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
120 #testcases strict unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
121 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
122 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
123 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
124 $ cat >> $HGRCPATH << EOF |
32892
a7851519ea02
check-concurrency: expose the feature as 'concurrent-push-mode'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32709
diff
changeset
|
125 > [server] |
a7851519ea02
check-concurrency: expose the feature as 'concurrent-push-mode'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32709
diff
changeset
|
126 > concurrent-push-mode = check-related |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
127 > EOF |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
128 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
129 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
130 |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
131 Setup |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
132 ----- |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
133 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
134 create a repo with one root |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
135 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 $ hg init server |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 $ cd server |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 $ echo root > root |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
139 $ hg ci -Am "C-ROOT" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
140 adding root |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 $ cd .. |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
143 clone it in two clients |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
144 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
145 $ hg clone ssh://user@dummy/server client-racy |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
146 requesting all changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 adding changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
148 adding manifests |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
149 adding file changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
151 new changesets 842e2fac6304 (1 drafts) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
152 updating to branch default |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
154 $ hg clone ssh://user@dummy/server client-other |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 requesting all changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
156 adding changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
157 adding manifests |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
158 adding file changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
159 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
160 new changesets 842e2fac6304 (1 drafts) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
161 updating to branch default |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
163 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
164 setup one to allow race on push |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
165 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
166 $ cat >> client-racy/.hg/hgrc << EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
167 > [extensions] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 > delaypush = $TESTTMP/delaypush.py |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
169 > [delaypush] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
170 > ready-path = $TESTTMP/readyfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
171 > release-path = $TESTTMP/watchfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
172 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
173 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
174 Simple race, both try to push to the server at the same time |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
175 ------------------------------------------------------------ |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
176 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
177 Both try to replace the same head |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
178 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
179 # a |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
180 # | b |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
181 # |/ |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
182 # * |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
183 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
184 Creating changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
185 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
186 $ echo b > client-other/a |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
187 $ hg -R client-other/ add client-other/a |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
188 $ hg -R client-other/ commit -m "C-A" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
189 $ echo b > client-racy/b |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
190 $ hg -R client-racy/ add client-racy/b |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
191 $ hg -R client-racy/ commit -m "C-B" |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
192 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
193 Pushing |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
194 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
195 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
196 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
197 $ waiton $TESTTMP/readyfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
198 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
199 $ hg -R client-other push -r 'tip' |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
200 pushing to ssh://user@dummy/server |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
201 searching for changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
202 remote: adding changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
203 remote: adding manifests |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
204 remote: adding file changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
205 remote: added 1 changesets with 1 changes to 1 files |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
206 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
207 $ release $TESTTMP/watchfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
208 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
209 Check the result of the push |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
210 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
211 $ cat ./push-log |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
212 pushing to ssh://user@dummy/server |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
213 searching for changes |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
214 wrote ready: $TESTTMP/readyfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
215 waiting on: $TESTTMP/watchfile |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
216 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
217 'remote repository changed while pushing - please try again' |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
218 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
219 $ hg -R server graph |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
220 o 98217d5a1659 C-A (default) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
221 | |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
222 @ 842e2fac6304 C-ROOT (default) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
223 |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
224 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
225 Pushing on two different heads |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
226 ------------------------------ |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
227 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
228 Both try to replace a different head |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
229 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
230 # a b |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
231 # | | |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
232 # * * |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
233 # |/ |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
234 # * |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
235 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
236 (resync-all) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
237 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
238 $ hg -R ./server pull ./client-racy |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
239 pulling from ./client-racy |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
240 searching for changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
241 adding changesets |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
242 adding manifests |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
243 adding file changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
244 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
245 new changesets a9149a1428e2 (1 drafts) |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
246 (run 'hg heads' to see heads, 'hg merge' to merge) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
247 $ hg -R ./client-other pull |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
248 pulling from ssh://user@dummy/server |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
249 searching for changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
250 adding changesets |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
251 adding manifests |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
252 adding file changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
253 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
254 new changesets a9149a1428e2 (1 drafts) |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
255 (run 'hg heads' to see heads, 'hg merge' to merge) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
256 $ hg -R ./client-racy pull |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
257 pulling from ssh://user@dummy/server |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
258 searching for changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
259 adding changesets |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
260 adding manifests |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
261 adding file changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
262 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
263 new changesets 98217d5a1659 (1 drafts) |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
264 (run 'hg heads' to see heads, 'hg merge' to merge) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
265 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
266 $ hg -R server graph |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
267 o a9149a1428e2 C-B (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
268 | |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
269 | o 98217d5a1659 C-A (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
270 |/ |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
271 @ 842e2fac6304 C-ROOT (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
272 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
273 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
274 Creating changesets |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
275 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
276 $ echo aa >> client-other/a |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
277 $ hg -R client-other/ commit -m "C-C" |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
278 $ echo bb >> client-racy/b |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
279 $ hg -R client-racy/ commit -m "C-D" |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
280 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
281 Pushing |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
282 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
283 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
284 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
285 $ waiton $TESTTMP/readyfile |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
286 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
287 $ hg -R client-other push -r 'tip' |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
288 pushing to ssh://user@dummy/server |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
289 searching for changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
290 remote: adding changesets |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
291 remote: adding manifests |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
292 remote: adding file changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
293 remote: added 1 changesets with 1 changes to 1 files |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
294 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
295 $ release $TESTTMP/watchfile |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
296 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
297 Check the result of the push |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
298 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
299 #if strict |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
300 $ cat ./push-log |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
301 pushing to ssh://user@dummy/server |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
302 searching for changes |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
303 wrote ready: $TESTTMP/readyfile |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
304 waiting on: $TESTTMP/watchfile |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
305 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
306 'remote repository changed while pushing - please try again' |
32631
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
307 |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
308 $ hg -R server graph |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
309 o 51c544a58128 C-C (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
310 | |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
311 o 98217d5a1659 C-A (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
312 | |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
313 | o a9149a1428e2 C-B (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
314 |/ |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
315 @ 842e2fac6304 C-ROOT (default) |
63afbc74a856
test: add a push race case where each client replaces a different head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32630
diff
changeset
|
316 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
317 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
318 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
319 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
320 (The two heads are unrelated, push should be allowed) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
321 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
322 $ cat ./push-log |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
323 pushing to ssh://user@dummy/server |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
324 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
325 wrote ready: $TESTTMP/readyfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
326 waiting on: $TESTTMP/watchfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
327 remote: adding changesets |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
328 remote: adding manifests |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
329 remote: adding file changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
330 remote: added 1 changesets with 1 changes to 1 files |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
331 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
332 $ hg -R server graph |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
333 o 59e76faf78bd C-D (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
334 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
335 o a9149a1428e2 C-B (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
336 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
337 | o 51c544a58128 C-C (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
338 | | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
339 | o 98217d5a1659 C-A (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
340 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
341 @ 842e2fac6304 C-ROOT (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
342 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
343 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
344 |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
345 Pushing while someone creates a new head |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
346 ----------------------------------------- |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
347 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
348 Pushing a new changeset while someone creates a new branch. |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
349 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
350 # a (raced) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
351 # | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
352 # * b |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
353 # |/ |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
354 # * |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
355 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
356 (resync-all) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
357 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
358 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
359 |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
360 $ hg -R ./server pull ./client-racy |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
361 pulling from ./client-racy |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
362 searching for changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
363 adding changesets |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
364 adding manifests |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
365 adding file changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
366 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
367 new changesets 59e76faf78bd (1 drafts) |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
368 (run 'hg update' to get a working copy) |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
369 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
370 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
371 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
372 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
373 $ hg -R ./server pull ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
374 pulling from ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
375 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
376 no changes found |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
377 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
378 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
379 |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
380 $ hg -R ./client-other pull |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
381 pulling from ssh://user@dummy/server |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
382 searching for changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
383 adding changesets |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
384 adding manifests |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
385 adding file changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
386 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
387 new changesets 59e76faf78bd (1 drafts) |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
388 (run 'hg update' to get a working copy) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
389 $ hg -R ./client-racy pull |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
390 pulling from ssh://user@dummy/server |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
391 searching for changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
392 adding changesets |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
393 adding manifests |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
394 adding file changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
395 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
396 new changesets 51c544a58128 (1 drafts) |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
397 (run 'hg update' to get a working copy) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
398 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
399 $ hg -R server graph |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
400 o 59e76faf78bd C-D (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
401 | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
402 o a9149a1428e2 C-B (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
403 | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
404 | o 51c544a58128 C-C (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
405 | | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
406 | o 98217d5a1659 C-A (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
407 |/ |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
408 @ 842e2fac6304 C-ROOT (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
409 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
410 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
411 Creating changesets |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
412 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
413 (new head) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
414 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
415 $ hg -R client-other/ up 'desc("C-A")' |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
416 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
417 $ echo aaa >> client-other/a |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
418 $ hg -R client-other/ commit -m "C-E" |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
419 created new head |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
420 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
421 (children of existing head) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
422 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
423 $ hg -R client-racy/ up 'desc("C-C")' |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
424 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
425 $ echo bbb >> client-racy/a |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
426 $ hg -R client-racy/ commit -m "C-F" |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
427 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
428 Pushing |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
429 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
430 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
431 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
432 $ waiton $TESTTMP/readyfile |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
433 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
434 $ hg -R client-other push -fr 'tip' |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
435 pushing to ssh://user@dummy/server |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
436 searching for changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
437 remote: adding changesets |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
438 remote: adding manifests |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
439 remote: adding file changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
440 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
441 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
442 $ release $TESTTMP/watchfile |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
443 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
444 Check the result of the push |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
445 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
446 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
447 |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
448 $ cat ./push-log |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
449 pushing to ssh://user@dummy/server |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
450 searching for changes |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
451 wrote ready: $TESTTMP/readyfile |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
452 waiting on: $TESTTMP/watchfile |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
453 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
454 'remote repository changed while pushing - please try again' |
32632
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
455 |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
456 $ hg -R server graph |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
457 o d603e2c0cdd7 C-E (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
458 | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
459 | o 51c544a58128 C-C (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
460 |/ |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
461 o 98217d5a1659 C-A (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
462 | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
463 | o 59e76faf78bd C-D (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
464 | | |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
465 | o a9149a1428e2 C-B (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
466 |/ |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
467 @ 842e2fac6304 C-ROOT (default) |
090a6fe6e563
test: add a push race case where the racing client create a new head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32631
diff
changeset
|
468 |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
469 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
470 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
471 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
472 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
473 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
474 (The racing new head do not affect existing heads, push should go through) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
475 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
476 $ cat ./push-log |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
477 pushing to ssh://user@dummy/server |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
478 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
479 wrote ready: $TESTTMP/readyfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
480 waiting on: $TESTTMP/watchfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
481 remote: adding changesets |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
482 remote: adding manifests |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
483 remote: adding file changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
484 remote: added 1 changesets with 1 changes to 1 files |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
485 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
486 $ hg -R server graph |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
487 o d9e379a8c432 C-F (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
488 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
489 o 51c544a58128 C-C (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
490 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
491 | o d603e2c0cdd7 C-E (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
492 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
493 o 98217d5a1659 C-A (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
494 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
495 | o 59e76faf78bd C-D (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
496 | | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
497 | o a9149a1428e2 C-B (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
498 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
499 @ 842e2fac6304 C-ROOT (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
500 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
501 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
502 |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
503 Pushing touching different named branch (same topo): new branch raced |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
504 --------------------------------------------------------------------- |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
505 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
506 Pushing two children on the same head, one is a different named branch |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
507 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
508 # a (raced, branch-a) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
509 # | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
510 # | b (default branch) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
511 # |/ |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
512 # * |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
513 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
514 (resync-all) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
515 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
516 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
517 |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
518 $ hg -R ./server pull ./client-racy |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
519 pulling from ./client-racy |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
520 searching for changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
521 adding changesets |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
522 adding manifests |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
523 adding file changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
524 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
525 new changesets d9e379a8c432 (1 drafts) |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
526 (run 'hg update' to get a working copy) |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
527 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
528 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
529 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
530 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
531 $ hg -R ./server pull ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
532 pulling from ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
533 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
534 no changes found |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
535 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
536 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
537 |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
538 $ hg -R ./client-other pull |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
539 pulling from ssh://user@dummy/server |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
540 searching for changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
541 adding changesets |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
542 adding manifests |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
543 adding file changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
544 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
545 new changesets d9e379a8c432 (1 drafts) |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
546 (run 'hg update' to get a working copy) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
547 $ hg -R ./client-racy pull |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
548 pulling from ssh://user@dummy/server |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
549 searching for changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
550 adding changesets |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
551 adding manifests |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
552 adding file changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
553 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
554 new changesets d603e2c0cdd7 (1 drafts) |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
555 (run 'hg heads .' to see heads, 'hg merge' to merge) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
556 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
557 $ hg -R server graph |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
558 o d9e379a8c432 C-F (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
559 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
560 o 51c544a58128 C-C (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
561 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
562 | o d603e2c0cdd7 C-E (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
563 |/ |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
564 o 98217d5a1659 C-A (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
565 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
566 | o 59e76faf78bd C-D (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
567 | | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
568 | o a9149a1428e2 C-B (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
569 |/ |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
570 @ 842e2fac6304 C-ROOT (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
571 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
572 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
573 Creating changesets |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
574 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
575 (update existing head) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
576 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
577 $ hg -R client-other/ up 'desc("C-F")' |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
578 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
579 $ echo aaa >> client-other/a |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
580 $ hg -R client-other/ commit -m "C-G" |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
581 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
582 (new named branch from that existing head) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
583 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
584 $ hg -R client-racy/ up 'desc("C-F")' |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
585 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
586 $ echo bbb >> client-racy/a |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
587 $ hg -R client-racy/ branch my-first-test-branch |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
588 marked working directory as branch my-first-test-branch |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
589 (branches are permanent and global, did you want a bookmark?) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
590 $ hg -R client-racy/ commit -m "C-H" |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
591 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
592 Pushing |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
593 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
594 $ hg -R client-racy push -r 'tip' --new-branch > ./push-log 2>&1 & |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
595 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
596 $ waiton $TESTTMP/readyfile |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
597 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
598 $ hg -R client-other push -fr 'tip' |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
599 pushing to ssh://user@dummy/server |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
600 searching for changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
601 remote: adding changesets |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
602 remote: adding manifests |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
603 remote: adding file changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
604 remote: added 1 changesets with 1 changes to 1 files |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
605 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
606 $ release $TESTTMP/watchfile |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
607 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
608 Check the result of the push |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
609 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
610 #if strict |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
611 $ cat ./push-log |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
612 pushing to ssh://user@dummy/server |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
613 searching for changes |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
614 wrote ready: $TESTTMP/readyfile |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
615 waiting on: $TESTTMP/watchfile |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
616 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
617 'remote repository changed while pushing - please try again' |
32633
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
618 |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
619 $ hg -R server graph |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
620 o 75d69cba5402 C-G (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
621 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
622 o d9e379a8c432 C-F (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
623 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
624 o 51c544a58128 C-C (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
625 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
626 | o d603e2c0cdd7 C-E (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
627 |/ |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
628 o 98217d5a1659 C-A (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
629 | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
630 | o 59e76faf78bd C-D (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
631 | | |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
632 | o a9149a1428e2 C-B (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
633 |/ |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
634 @ 842e2fac6304 C-ROOT (default) |
b01bfa5abbfe
test: add a push race case where raced push created a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32632
diff
changeset
|
635 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
636 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
637 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
638 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
639 (unrelated named branches are unrelated) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
640 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
641 $ cat ./push-log |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
642 pushing to ssh://user@dummy/server |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
643 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
644 wrote ready: $TESTTMP/readyfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
645 waiting on: $TESTTMP/watchfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
646 remote: adding changesets |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
647 remote: adding manifests |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
648 remote: adding file changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
649 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
650 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
651 $ hg -R server graph |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
652 o 833be552cfe6 C-H (my-first-test-branch) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
653 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
654 | o 75d69cba5402 C-G (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
655 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
656 o d9e379a8c432 C-F (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
657 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
658 o 51c544a58128 C-C (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
659 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
660 | o d603e2c0cdd7 C-E (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
661 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
662 o 98217d5a1659 C-A (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
663 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
664 | o 59e76faf78bd C-D (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
665 | | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
666 | o a9149a1428e2 C-B (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
667 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
668 @ 842e2fac6304 C-ROOT (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
669 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
670 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
671 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
672 The racing new head do not affect existing heads, push should go through |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
673 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
674 pushing touching different named branch (same topo): old branch raced |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
675 --------------------------------------------------------------------- |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
676 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
677 Pushing two children on the same head, one is a different named branch |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
678 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
679 # a (raced, default-branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
680 # | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
681 # | b (new branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
682 # |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
683 # * (default-branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
684 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
685 (resync-all) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
686 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
687 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
688 |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
689 $ hg -R ./server pull ./client-racy |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
690 pulling from ./client-racy |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
691 searching for changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
692 adding changesets |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
693 adding manifests |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
694 adding file changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
695 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
696 new changesets 833be552cfe6 (1 drafts) |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
697 (run 'hg heads .' to see heads, 'hg merge' to merge) |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
698 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
699 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
700 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
701 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
702 $ hg -R ./server pull ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
703 pulling from ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
704 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
705 no changes found |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
706 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
707 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
708 |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
709 $ hg -R ./client-other pull |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
710 pulling from ssh://user@dummy/server |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
711 searching for changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
712 adding changesets |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
713 adding manifests |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
714 adding file changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
715 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
716 new changesets 833be552cfe6 (1 drafts) |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
717 (run 'hg heads .' to see heads, 'hg merge' to merge) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
718 $ hg -R ./client-racy pull |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
719 pulling from ssh://user@dummy/server |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
720 searching for changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
721 adding changesets |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
722 adding manifests |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
723 adding file changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
724 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
725 new changesets 75d69cba5402 (1 drafts) |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
726 (run 'hg heads' to see heads) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
727 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
728 $ hg -R server graph |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
729 o 833be552cfe6 C-H (my-first-test-branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
730 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
731 | o 75d69cba5402 C-G (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
732 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
733 o d9e379a8c432 C-F (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
734 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
735 o 51c544a58128 C-C (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
736 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
737 | o d603e2c0cdd7 C-E (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
738 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
739 o 98217d5a1659 C-A (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
740 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
741 | o 59e76faf78bd C-D (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
742 | | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
743 | o a9149a1428e2 C-B (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
744 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
745 @ 842e2fac6304 C-ROOT (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
746 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
747 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
748 Creating changesets |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
749 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
750 (new named branch from one head) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
751 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
752 $ hg -R client-other/ up 'desc("C-G")' |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
753 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
754 $ echo aaa >> client-other/a |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
755 $ hg -R client-other/ branch my-second-test-branch |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
756 marked working directory as branch my-second-test-branch |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
757 $ hg -R client-other/ commit -m "C-I" |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
758 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
759 (children "updating" that same head) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
760 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
761 $ hg -R client-racy/ up 'desc("C-G")' |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
762 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
763 $ echo bbb >> client-racy/a |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
764 $ hg -R client-racy/ commit -m "C-J" |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
765 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
766 Pushing |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
767 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
768 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
769 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
770 $ waiton $TESTTMP/readyfile |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
771 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
772 $ hg -R client-other push -fr 'tip' --new-branch |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
773 pushing to ssh://user@dummy/server |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
774 searching for changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
775 remote: adding changesets |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
776 remote: adding manifests |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
777 remote: adding file changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
778 remote: added 1 changesets with 1 changes to 1 files |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
779 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
780 $ release $TESTTMP/watchfile |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
781 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
782 Check the result of the push |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
783 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
784 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
785 |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
786 $ cat ./push-log |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
787 pushing to ssh://user@dummy/server |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
788 searching for changes |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
789 wrote ready: $TESTTMP/readyfile |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
790 waiting on: $TESTTMP/watchfile |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
791 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
792 'remote repository changed while pushing - please try again' |
32634
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
793 |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
794 $ hg -R server graph |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
795 o b35ed749f288 C-I (my-second-test-branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
796 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
797 o 75d69cba5402 C-G (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
798 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
799 | o 833be552cfe6 C-H (my-first-test-branch) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
800 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
801 o d9e379a8c432 C-F (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
802 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
803 o 51c544a58128 C-C (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
804 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
805 | o d603e2c0cdd7 C-E (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
806 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
807 o 98217d5a1659 C-A (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
808 | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
809 | o 59e76faf78bd C-D (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
810 | | |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
811 | o a9149a1428e2 C-B (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
812 |/ |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
813 @ 842e2fac6304 C-ROOT (default) |
8d10e21e3b57
test: add a push race case where racing push create a new named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32633
diff
changeset
|
814 |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
815 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
816 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
817 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
818 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
819 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
820 (unrelated named branches are unrelated) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
821 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
822 $ cat ./push-log |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
823 pushing to ssh://user@dummy/server |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
824 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
825 wrote ready: $TESTTMP/readyfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
826 waiting on: $TESTTMP/watchfile |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
827 remote: adding changesets |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
828 remote: adding manifests |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
829 remote: adding file changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
830 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
831 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
832 $ hg -R server graph |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
833 o 89420bf00fae C-J (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
834 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
835 | o b35ed749f288 C-I (my-second-test-branch) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
836 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
837 o 75d69cba5402 C-G (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
838 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
839 | o 833be552cfe6 C-H (my-first-test-branch) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
840 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
841 o d9e379a8c432 C-F (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
842 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
843 o 51c544a58128 C-C (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
844 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
845 | o d603e2c0cdd7 C-E (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
846 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
847 o 98217d5a1659 C-A (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
848 | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
849 | o 59e76faf78bd C-D (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
850 | | |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
851 | o a9149a1428e2 C-B (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
852 |/ |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
853 @ 842e2fac6304 C-ROOT (default) |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
854 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
855 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
856 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
857 |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
858 pushing racing push touch multiple heads |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
859 ---------------------------------------- |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
860 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
861 There are multiple heads, but the racing push touch all of them |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
862 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
863 # a (raced) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
864 # | b |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
865 # |/| |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
866 # * * |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
867 # |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
868 # * |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
869 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
870 (resync-all) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
871 |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
872 #if strict |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
873 |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
874 $ hg -R ./server pull ./client-racy |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
875 pulling from ./client-racy |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
876 searching for changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
877 adding changesets |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
878 adding manifests |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
879 adding file changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
880 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
881 new changesets 89420bf00fae (1 drafts) |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
882 (run 'hg heads .' to see heads, 'hg merge' to merge) |
32709
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
883 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
884 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
885 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
886 #if unrelated |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
887 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
888 $ hg -R ./server pull ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
889 pulling from ./client-racy |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
890 searching for changes |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
891 no changes found |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
892 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
893 #endif |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
894 |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
895 $ hg -R ./client-other pull |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
896 pulling from ssh://user@dummy/server |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
897 searching for changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
898 adding changesets |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
899 adding manifests |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
900 adding file changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
901 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
902 new changesets 89420bf00fae (1 drafts) |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
903 (run 'hg heads' to see heads) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
904 $ hg -R ./client-racy pull |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
905 pulling from ssh://user@dummy/server |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
906 searching for changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
907 adding changesets |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
908 adding manifests |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
909 adding file changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
910 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
911 new changesets b35ed749f288 (1 drafts) |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
912 (run 'hg heads .' to see heads, 'hg merge' to merge) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
913 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
914 $ hg -R server graph |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
915 o 89420bf00fae C-J (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
916 | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
917 | o b35ed749f288 C-I (my-second-test-branch) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
918 |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
919 o 75d69cba5402 C-G (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
920 | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
921 | o 833be552cfe6 C-H (my-first-test-branch) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
922 |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
923 o d9e379a8c432 C-F (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
924 | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
925 o 51c544a58128 C-C (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
926 | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
927 | o d603e2c0cdd7 C-E (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
928 |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
929 o 98217d5a1659 C-A (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
930 | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
931 | o 59e76faf78bd C-D (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
932 | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
933 | o a9149a1428e2 C-B (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
934 |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
935 @ 842e2fac6304 C-ROOT (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
936 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
937 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
938 Creating changesets |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
939 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
940 (merges heads) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
941 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
942 $ hg -R client-other/ up 'desc("C-E")' |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
943 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
944 $ hg -R client-other/ merge 'desc("C-D")' |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
945 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
946 (branch merge, don't forget to commit) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
947 $ hg -R client-other/ commit -m "C-K" |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
948 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
949 (update one head) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
950 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
951 $ hg -R client-racy/ up 'desc("C-D")' |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
952 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
953 $ echo bbb >> client-racy/b |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
954 $ hg -R client-racy/ commit -m "C-L" |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
955 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
956 Pushing |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
957 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
958 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
959 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
960 $ waiton $TESTTMP/readyfile |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
961 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
962 $ hg -R client-other push -fr 'tip' --new-branch |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
963 pushing to ssh://user@dummy/server |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
964 searching for changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
965 remote: adding changesets |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
966 remote: adding manifests |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
967 remote: adding file changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
968 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
969 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
970 $ release $TESTTMP/watchfile |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
971 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
972 Check the result of the push |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
973 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
974 $ cat ./push-log |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
975 pushing to ssh://user@dummy/server |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
976 searching for changes |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
977 wrote ready: $TESTTMP/readyfile |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
978 waiting on: $TESTTMP/watchfile |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
979 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
980 'remote repository changed while pushing - please try again' |
32635
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
981 |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
982 $ hg -R server graph |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
983 o be705100c623 C-K (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
984 |\ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
985 | o d603e2c0cdd7 C-E (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
986 | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
987 o | 59e76faf78bd C-D (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
988 | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
989 | | o 89420bf00fae C-J (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
990 | | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
991 | | | o b35ed749f288 C-I (my-second-test-branch) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
992 | | |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
993 | | o 75d69cba5402 C-G (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
994 | | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
995 | | | o 833be552cfe6 C-H (my-first-test-branch) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
996 | | |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
997 | | o d9e379a8c432 C-F (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
998 | | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
999 | | o 51c544a58128 C-C (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1000 | |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1001 o | a9149a1428e2 C-B (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1002 | | |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1003 | o 98217d5a1659 C-A (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1004 |/ |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1005 @ 842e2fac6304 C-ROOT (default) |
32c80d07952b
test: add a push race case where racing push touches multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32634
diff
changeset
|
1006 |
32636
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1007 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1008 pushing raced push touch multiple heads |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1009 --------------------------------------- |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1010 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1011 There are multiple heads, the raced push touch all of them |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1012 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1013 # b |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1014 # | a (raced) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1015 # |/| |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1016 # * * |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1017 # |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1018 # * |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1019 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1020 (resync-all) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1021 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1022 $ hg -R ./server pull ./client-racy |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1023 pulling from ./client-racy |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1024 searching for changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1025 adding changesets |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1026 adding manifests |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1027 adding file changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1028 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1029 new changesets cac2cead0ff0 (1 drafts) |
32636
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1030 (run 'hg heads .' to see heads, 'hg merge' to merge) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1031 $ hg -R ./client-other pull |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1032 pulling from ssh://user@dummy/server |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1033 searching for changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1034 adding changesets |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1035 adding manifests |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1036 adding file changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1037 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1038 new changesets cac2cead0ff0 (1 drafts) |
32636
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1039 (run 'hg heads .' to see heads, 'hg merge' to merge) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1040 $ hg -R ./client-racy pull |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1041 pulling from ssh://user@dummy/server |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1042 searching for changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1043 adding changesets |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1044 adding manifests |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1045 adding file changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1046 added 1 changesets with 0 changes to 0 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1047 new changesets be705100c623 (1 drafts) |
32636
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1048 (run 'hg update' to get a working copy) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1049 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1050 $ hg -R server graph |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1051 o cac2cead0ff0 C-L (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1052 | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1053 | o be705100c623 C-K (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1054 |/| |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1055 | o d603e2c0cdd7 C-E (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1056 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1057 o | 59e76faf78bd C-D (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1058 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1059 | | o 89420bf00fae C-J (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1060 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1061 | | | o b35ed749f288 C-I (my-second-test-branch) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1062 | | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1063 | | o 75d69cba5402 C-G (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1064 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1065 | | | o 833be552cfe6 C-H (my-first-test-branch) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1066 | | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1067 | | o d9e379a8c432 C-F (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1068 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1069 | | o 51c544a58128 C-C (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1070 | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1071 o | a9149a1428e2 C-B (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1072 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1073 | o 98217d5a1659 C-A (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1074 |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1075 @ 842e2fac6304 C-ROOT (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1076 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1077 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1078 Creating changesets |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1079 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1080 (update existing head) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1081 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1082 $ echo aaa >> client-other/a |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1083 $ hg -R client-other/ commit -m "C-M" |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1084 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1085 (merge heads) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1086 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1087 $ hg -R client-racy/ merge 'desc("C-K")' |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1088 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1089 (branch merge, don't forget to commit) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1090 $ hg -R client-racy/ commit -m "C-N" |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1091 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1092 Pushing |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1093 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1094 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1095 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1096 $ waiton $TESTTMP/readyfile |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1097 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1098 $ hg -R client-other push -fr 'tip' --new-branch |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1099 pushing to ssh://user@dummy/server |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1100 searching for changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1101 remote: adding changesets |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1102 remote: adding manifests |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1103 remote: adding file changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1104 remote: added 1 changesets with 1 changes to 1 files |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1105 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1106 $ release $TESTTMP/watchfile |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1107 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1108 Check the result of the push |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1109 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1110 $ cat ./push-log |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1111 pushing to ssh://user@dummy/server |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1112 searching for changes |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1113 wrote ready: $TESTTMP/readyfile |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1114 waiting on: $TESTTMP/watchfile |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1115 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
1116 'remote repository changed while pushing - please try again' |
32636
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1117 |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1118 $ hg -R server graph |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1119 o 6fd3090135df C-M (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1120 | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1121 o be705100c623 C-K (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1122 |\ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1123 | o d603e2c0cdd7 C-E (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1124 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1125 +---o cac2cead0ff0 C-L (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1126 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1127 o | 59e76faf78bd C-D (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1128 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1129 | | o 89420bf00fae C-J (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1130 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1131 | | | o b35ed749f288 C-I (my-second-test-branch) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1132 | | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1133 | | o 75d69cba5402 C-G (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1134 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1135 | | | o 833be552cfe6 C-H (my-first-test-branch) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1136 | | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1137 | | o d9e379a8c432 C-F (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1138 | | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1139 | | o 51c544a58128 C-C (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1140 | |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1141 o | a9149a1428e2 C-B (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1142 | | |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1143 | o 98217d5a1659 C-A (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1144 |/ |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1145 @ 842e2fac6304 C-ROOT (default) |
da5cf8cc5aad
test: add a push race case where the raced push touch multiple heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32635
diff
changeset
|
1146 |
32637
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1147 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1148 racing commit push a new head behind another named branch |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1149 --------------------------------------------------------- |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1150 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1151 non-continuous branch are valid case, we tests for them. |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1152 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1153 # b (branch default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1154 # | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1155 # o (branch foo) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1156 # | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1157 # | a (raced, branch default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1158 # |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1159 # * (branch foo) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1160 # | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1161 # * (branch default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1162 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1163 (resync-all + other branch) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1164 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1165 $ hg -R ./server pull ./client-racy |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1166 pulling from ./client-racy |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1167 searching for changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1168 adding changesets |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1169 adding manifests |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1170 adding file changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1171 added 1 changesets with 0 changes to 0 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1172 new changesets 866a66e18630 (1 drafts) |
32637
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1173 (run 'hg update' to get a working copy) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1174 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1175 (creates named branch on head) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1176 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1177 $ hg -R ./server/ up 'desc("C-N")' |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1178 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1179 $ hg -R ./server/ branch other |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1180 marked working directory as branch other |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1181 $ hg -R ./server/ ci -m "C-Z" |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1182 $ hg -R ./server/ up null |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1183 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1184 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1185 (sync client) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1186 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1187 $ hg -R ./client-other pull |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1188 pulling from ssh://user@dummy/server |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1189 searching for changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1190 adding changesets |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1191 adding manifests |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1192 adding file changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1193 added 2 changesets with 0 changes to 0 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1194 new changesets 866a66e18630:55a6f1c01b48 (2 drafts) |
32637
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1195 (run 'hg update' to get a working copy) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1196 $ hg -R ./client-racy pull |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1197 pulling from ssh://user@dummy/server |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1198 searching for changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1199 adding changesets |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1200 adding manifests |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1201 adding file changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1202 added 2 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1203 new changesets 6fd3090135df:55a6f1c01b48 (2 drafts) |
32637
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1204 (run 'hg heads .' to see heads, 'hg merge' to merge) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1205 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1206 $ hg -R server graph |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1207 o 55a6f1c01b48 C-Z (other) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1208 | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1209 o 866a66e18630 C-N (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1210 |\ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1211 +---o 6fd3090135df C-M (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1212 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1213 | o cac2cead0ff0 C-L (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1214 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1215 o | be705100c623 C-K (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1216 |\| |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1217 o | d603e2c0cdd7 C-E (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1218 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1219 | o 59e76faf78bd C-D (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1220 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1221 | | o 89420bf00fae C-J (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1222 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1223 | | | o b35ed749f288 C-I (my-second-test-branch) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1224 | | |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1225 | | o 75d69cba5402 C-G (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1226 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1227 | | | o 833be552cfe6 C-H (my-first-test-branch) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1228 | | |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1229 | | o d9e379a8c432 C-F (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1230 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1231 +---o 51c544a58128 C-C (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1232 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1233 | o a9149a1428e2 C-B (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1234 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1235 o | 98217d5a1659 C-A (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1236 |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1237 o 842e2fac6304 C-ROOT (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1238 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1239 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1240 Creating changesets |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1241 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1242 (update default head through another named branch one) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1243 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1244 $ hg -R client-other/ up 'desc("C-Z")' |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1245 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1246 $ echo aaa >> client-other/a |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1247 $ hg -R client-other/ commit -m "C-O" |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1248 $ echo aaa >> client-other/a |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1249 $ hg -R client-other/ branch --force default |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1250 marked working directory as branch default |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1251 $ hg -R client-other/ commit -m "C-P" |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1252 created new head |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1253 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1254 (update default head) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1255 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1256 $ hg -R client-racy/ up 'desc("C-Z")' |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1258 $ echo bbb >> client-other/a |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1259 $ hg -R client-racy/ branch --force default |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1260 marked working directory as branch default |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1261 $ hg -R client-racy/ commit -m "C-Q" |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1262 created new head |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1263 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1264 Pushing |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1265 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1266 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1267 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1268 $ waiton $TESTTMP/readyfile |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1269 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1270 $ hg -R client-other push -fr 'tip' --new-branch |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1271 pushing to ssh://user@dummy/server |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1272 searching for changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1273 remote: adding changesets |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1274 remote: adding manifests |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1275 remote: adding file changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1276 remote: added 2 changesets with 1 changes to 1 files |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1277 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1278 $ release $TESTTMP/watchfile |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1279 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1280 Check the result of the push |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1281 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1282 $ cat ./push-log |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1283 pushing to ssh://user@dummy/server |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1284 searching for changes |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1285 wrote ready: $TESTTMP/readyfile |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1286 waiting on: $TESTTMP/watchfile |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1287 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
1288 'remote repository changed while pushing - please try again' |
32637
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1289 |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1290 $ hg -R server graph |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1291 o 1b58ee3f79e5 C-P (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1292 | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1293 o d0a85b2252a9 C-O (other) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1294 | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1295 o 55a6f1c01b48 C-Z (other) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1296 | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1297 o 866a66e18630 C-N (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1298 |\ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1299 +---o 6fd3090135df C-M (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1300 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1301 | o cac2cead0ff0 C-L (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1302 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1303 o | be705100c623 C-K (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1304 |\| |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1305 o | d603e2c0cdd7 C-E (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1306 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1307 | o 59e76faf78bd C-D (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1308 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1309 | | o 89420bf00fae C-J (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1310 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1311 | | | o b35ed749f288 C-I (my-second-test-branch) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1312 | | |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1313 | | o 75d69cba5402 C-G (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1314 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1315 | | | o 833be552cfe6 C-H (my-first-test-branch) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1316 | | |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1317 | | o d9e379a8c432 C-F (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1318 | | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1319 +---o 51c544a58128 C-C (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1320 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1321 | o a9149a1428e2 C-B (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1322 | | |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1323 o | 98217d5a1659 C-A (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1324 |/ |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1325 o 842e2fac6304 C-ROOT (default) |
9234d2cb24a5
test: add a push race case where non-contiguous branch head are created
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32636
diff
changeset
|
1326 |
32638
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1327 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1328 raced commit push a new head behind another named branch |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1329 --------------------------------------------------------- |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1330 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1331 non-continuous branch are valid case, we tests for them. |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1332 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1333 # b (raced branch default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1334 # | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1335 # o (branch foo) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1336 # | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1337 # | a (branch default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1338 # |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1339 # * (branch foo) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1340 # | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1341 # * (branch default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1342 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1343 (resync-all) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1344 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1345 $ hg -R ./server pull ./client-racy |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1346 pulling from ./client-racy |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1347 searching for changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1348 adding changesets |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1349 adding manifests |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1350 adding file changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1351 added 1 changesets with 0 changes to 0 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1352 new changesets b0ee3d6f51bc (1 drafts) |
32638
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1353 (run 'hg heads .' to see heads, 'hg merge' to merge) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1354 $ hg -R ./client-other pull |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1355 pulling from ssh://user@dummy/server |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1356 searching for changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1357 adding changesets |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1358 adding manifests |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1359 adding file changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1360 added 1 changesets with 0 changes to 0 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1361 new changesets b0ee3d6f51bc (1 drafts) |
32638
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1362 (run 'hg heads .' to see heads, 'hg merge' to merge) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1363 $ hg -R ./client-racy pull |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1364 pulling from ssh://user@dummy/server |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1365 searching for changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1366 adding changesets |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1367 adding manifests |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1368 adding file changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1369 added 2 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1370 new changesets d0a85b2252a9:1b58ee3f79e5 (2 drafts) |
32638
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1371 (run 'hg heads .' to see heads, 'hg merge' to merge) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1372 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1373 $ hg -R server graph |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1374 o b0ee3d6f51bc C-Q (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1375 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1376 | o 1b58ee3f79e5 C-P (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1377 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1378 | o d0a85b2252a9 C-O (other) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1379 |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1380 o 55a6f1c01b48 C-Z (other) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1381 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1382 o 866a66e18630 C-N (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1383 |\ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1384 +---o 6fd3090135df C-M (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1385 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1386 | o cac2cead0ff0 C-L (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1387 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1388 o | be705100c623 C-K (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1389 |\| |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1390 o | d603e2c0cdd7 C-E (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1391 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1392 | o 59e76faf78bd C-D (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1393 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1394 | | o 89420bf00fae C-J (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1395 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1396 | | | o b35ed749f288 C-I (my-second-test-branch) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1397 | | |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1398 | | o 75d69cba5402 C-G (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1399 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1400 | | | o 833be552cfe6 C-H (my-first-test-branch) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1401 | | |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1402 | | o d9e379a8c432 C-F (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1403 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1404 +---o 51c544a58128 C-C (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1405 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1406 | o a9149a1428e2 C-B (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1407 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1408 o | 98217d5a1659 C-A (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1409 |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1410 o 842e2fac6304 C-ROOT (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1411 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1412 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1413 Creating changesets |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1414 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1415 (update 'other' named branch head) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1416 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1417 $ hg -R client-other/ up 'desc("C-P")' |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1418 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1419 $ echo aaa >> client-other/a |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1420 $ hg -R client-other/ branch --force other |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1421 marked working directory as branch other |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1422 $ hg -R client-other/ commit -m "C-R" |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1423 created new head |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1424 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1425 (update 'other named brnach through a 'default' changeset') |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1426 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1427 $ hg -R client-racy/ up 'desc("C-P")' |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1428 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1429 $ echo bbb >> client-racy/a |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1430 $ hg -R client-racy/ commit -m "C-S" |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1431 $ echo bbb >> client-racy/a |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1432 $ hg -R client-racy/ branch --force other |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1433 marked working directory as branch other |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1434 $ hg -R client-racy/ commit -m "C-T" |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1435 created new head |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1436 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1437 Pushing |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1438 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1439 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1440 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1441 $ waiton $TESTTMP/readyfile |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1442 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1443 $ hg -R client-other push -fr 'tip' --new-branch |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1444 pushing to ssh://user@dummy/server |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1445 searching for changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1446 remote: adding changesets |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1447 remote: adding manifests |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1448 remote: adding file changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1449 remote: added 1 changesets with 1 changes to 1 files |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1450 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1451 $ release $TESTTMP/watchfile |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1452 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1453 Check the result of the push |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1454 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1455 $ cat ./push-log |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1456 pushing to ssh://user@dummy/server |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1457 searching for changes |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1458 wrote ready: $TESTTMP/readyfile |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1459 waiting on: $TESTTMP/watchfile |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1460 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
1461 'remote repository changed while pushing - please try again' |
32638
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1462 |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1463 $ hg -R server graph |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1464 o de7b9e2ba3f6 C-R (other) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1465 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1466 o 1b58ee3f79e5 C-P (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1467 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1468 o d0a85b2252a9 C-O (other) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1469 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1470 | o b0ee3d6f51bc C-Q (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1471 |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1472 o 55a6f1c01b48 C-Z (other) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1473 | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1474 o 866a66e18630 C-N (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1475 |\ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1476 +---o 6fd3090135df C-M (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1477 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1478 | o cac2cead0ff0 C-L (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1479 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1480 o | be705100c623 C-K (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1481 |\| |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1482 o | d603e2c0cdd7 C-E (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1483 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1484 | o 59e76faf78bd C-D (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1485 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1486 | | o 89420bf00fae C-J (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1487 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1488 | | | o b35ed749f288 C-I (my-second-test-branch) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1489 | | |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1490 | | o 75d69cba5402 C-G (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1491 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1492 | | | o 833be552cfe6 C-H (my-first-test-branch) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1493 | | |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1494 | | o d9e379a8c432 C-F (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1495 | | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1496 +---o 51c544a58128 C-C (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1497 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1498 | o a9149a1428e2 C-B (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1499 | | |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1500 o | 98217d5a1659 C-A (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1501 |/ |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1502 o 842e2fac6304 C-ROOT (default) |
4f6645ec6bb2
test: add the mirror push race case for non-contiguous branch head
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32637
diff
changeset
|
1503 |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1504 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1505 raced commit push a new head obsoleting the one touched by the racing push |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1506 -------------------------------------------------------------------------- |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1507 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1508 # b (racing) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1509 # | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1510 # ø⇠◔ a (raced) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1511 # |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1512 # * |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1513 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1514 (resync-all) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1515 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1516 $ hg -R ./server pull ./client-racy |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1517 pulling from ./client-racy |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1518 searching for changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1519 adding changesets |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1520 adding manifests |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1521 adding file changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1522 added 2 changesets with 2 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1523 new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts) |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1524 (run 'hg heads .' to see heads, 'hg merge' to merge) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1525 $ hg -R ./client-other pull |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1526 pulling from ssh://user@dummy/server |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1527 searching for changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1528 adding changesets |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1529 adding manifests |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1530 adding file changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1531 added 2 changesets with 2 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1532 new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts) |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1533 (run 'hg heads' to see heads, 'hg merge' to merge) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1534 $ hg -R ./client-racy pull |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1535 pulling from ssh://user@dummy/server |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1536 searching for changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1537 adding changesets |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1538 adding manifests |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1539 adding file changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1540 added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1541 new changesets de7b9e2ba3f6 (1 drafts) |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1542 (run 'hg heads' to see heads, 'hg merge' to merge) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1543 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1544 $ hg -R server graph |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1545 o 3d57ed3c1091 C-T (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1546 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1547 o 2efd43f7b5ba C-S (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1548 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1549 | o de7b9e2ba3f6 C-R (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1550 |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1551 o 1b58ee3f79e5 C-P (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1552 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1553 o d0a85b2252a9 C-O (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1554 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1555 | o b0ee3d6f51bc C-Q (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1556 |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1557 o 55a6f1c01b48 C-Z (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1558 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1559 o 866a66e18630 C-N (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1560 |\ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1561 +---o 6fd3090135df C-M (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1562 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1563 | o cac2cead0ff0 C-L (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1564 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1565 o | be705100c623 C-K (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1566 |\| |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1567 o | d603e2c0cdd7 C-E (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1568 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1569 | o 59e76faf78bd C-D (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1570 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1571 | | o 89420bf00fae C-J (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1572 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1573 | | | o b35ed749f288 C-I (my-second-test-branch) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1574 | | |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1575 | | o 75d69cba5402 C-G (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1576 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1577 | | | o 833be552cfe6 C-H (my-first-test-branch) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1578 | | |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1579 | | o d9e379a8c432 C-F (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1580 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1581 +---o 51c544a58128 C-C (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1582 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1583 | o a9149a1428e2 C-B (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1584 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1585 o | 98217d5a1659 C-A (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1586 |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1587 o 842e2fac6304 C-ROOT (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1588 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1589 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1590 Creating changesets and markers |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1591 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1592 (continue existing head) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1593 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1594 $ hg -R client-other/ up 'desc("C-Q")' |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1595 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1596 $ echo aaa >> client-other/a |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1597 $ hg -R client-other/ commit -m "C-U" |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1598 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1599 (new topo branch obsoleting that same head) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1600 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1601 $ hg -R client-racy/ up 'desc("C-Z")' |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1602 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1603 $ echo bbb >> client-racy/a |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1604 $ hg -R client-racy/ branch --force default |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1605 marked working directory as branch default |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1606 $ hg -R client-racy/ commit -m "C-V" |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1607 created new head |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1608 $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'` |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1609 $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'` |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1610 $ hg -R client-racy debugobsolete $ID_Q $ID_V |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33314
diff
changeset
|
1611 obsoleted 1 changesets |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1612 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1613 Pushing |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1614 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1615 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1616 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1617 $ waiton $TESTTMP/readyfile |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1618 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1619 $ hg -R client-other push -fr 'tip' --new-branch |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1620 pushing to ssh://user@dummy/server |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1621 searching for changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1622 remote: adding changesets |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1623 remote: adding manifests |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1624 remote: adding file changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1625 remote: added 1 changesets with 0 changes to 0 files |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1626 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1627 $ release $TESTTMP/watchfile |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1628 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1629 Check the result of the push |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1630 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1631 $ cat ./push-log |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1632 pushing to ssh://user@dummy/server |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1633 searching for changes |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1634 wrote ready: $TESTTMP/readyfile |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1635 waiting on: $TESTTMP/watchfile |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1636 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
1637 'remote repository changed while pushing - please try again' |
32669
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1638 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1639 $ hg -R server debugobsolete |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1640 $ hg -R server graph |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1641 o a98a47d8b85b C-U (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1642 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1643 o b0ee3d6f51bc C-Q (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1644 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1645 | o 3d57ed3c1091 C-T (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1646 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1647 | o 2efd43f7b5ba C-S (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1648 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1649 | | o de7b9e2ba3f6 C-R (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1650 | |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1651 | o 1b58ee3f79e5 C-P (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1652 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1653 | o d0a85b2252a9 C-O (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1654 |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1655 o 55a6f1c01b48 C-Z (other) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1656 | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1657 o 866a66e18630 C-N (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1658 |\ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1659 +---o 6fd3090135df C-M (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1660 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1661 | o cac2cead0ff0 C-L (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1662 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1663 o | be705100c623 C-K (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1664 |\| |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1665 o | d603e2c0cdd7 C-E (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1666 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1667 | o 59e76faf78bd C-D (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1668 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1669 | | o 89420bf00fae C-J (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1670 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1671 | | | o b35ed749f288 C-I (my-second-test-branch) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1672 | | |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1673 | | o 75d69cba5402 C-G (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1674 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1675 | | | o 833be552cfe6 C-H (my-first-test-branch) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1676 | | |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1677 | | o d9e379a8c432 C-F (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1678 | | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1679 +---o 51c544a58128 C-C (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1680 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1681 | o a9149a1428e2 C-B (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1682 | | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1683 o | 98217d5a1659 C-A (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1684 |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1685 o 842e2fac6304 C-ROOT (default) |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1686 |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1687 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1688 racing commit push a new head obsoleting the one touched by the raced push |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1689 -------------------------------------------------------------------------- |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1690 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1691 (mirror test case of the previous one |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1692 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1693 # a (raced branch default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1694 # | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1695 # ø⇠◔ b (racing) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1696 # |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1697 # * |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1698 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1699 (resync-all) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1700 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1701 $ hg -R ./server pull ./client-racy |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1702 pulling from ./client-racy |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1703 searching for changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1704 adding changesets |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1705 adding manifests |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1706 adding file changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1707 added 1 changesets with 1 changes to 1 files (+1 heads) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1708 1 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32892
diff
changeset
|
1709 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
1710 1 new orphan changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1711 new changesets 720c5163ecf6 (1 drafts) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1712 (run 'hg heads .' to see heads, 'hg merge' to merge) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1713 $ hg -R ./client-other pull |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1714 pulling from ssh://user@dummy/server |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1715 searching for changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1716 adding changesets |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1717 adding manifests |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1718 adding file changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1719 added 1 changesets with 1 changes to 1 files (+1 heads) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1720 1 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32892
diff
changeset
|
1721 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
1722 1 new orphan changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1723 new changesets 720c5163ecf6 (1 drafts) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1724 (run 'hg heads .' to see heads, 'hg merge' to merge) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1725 $ hg -R ./client-racy pull |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1726 pulling from ssh://user@dummy/server |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1727 searching for changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1728 adding changesets |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1729 adding manifests |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1730 adding file changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1731 added 1 changesets with 0 changes to 0 files |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
1732 1 new orphan changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1733 new changesets a98a47d8b85b (1 drafts) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1734 (run 'hg update' to get a working copy) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1735 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1736 $ hg -R server debugobsolete |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1737 b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1738 $ hg -R server graph |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1739 o 720c5163ecf6 C-V (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1740 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
34865
diff
changeset
|
1741 | * a98a47d8b85b C-U (default) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1742 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1743 | x b0ee3d6f51bc C-Q (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1744 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1745 | o 3d57ed3c1091 C-T (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1746 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1747 | o 2efd43f7b5ba C-S (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1748 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1749 | | o de7b9e2ba3f6 C-R (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1750 | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1751 | o 1b58ee3f79e5 C-P (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1752 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1753 | o d0a85b2252a9 C-O (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1754 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1755 o 55a6f1c01b48 C-Z (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1756 | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1757 o 866a66e18630 C-N (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1758 |\ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1759 +---o 6fd3090135df C-M (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1760 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1761 | o cac2cead0ff0 C-L (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1762 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1763 o | be705100c623 C-K (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1764 |\| |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1765 o | d603e2c0cdd7 C-E (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1766 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1767 | o 59e76faf78bd C-D (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1768 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1769 | | o 89420bf00fae C-J (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1770 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1771 | | | o b35ed749f288 C-I (my-second-test-branch) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1772 | | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1773 | | o 75d69cba5402 C-G (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1774 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1775 | | | o 833be552cfe6 C-H (my-first-test-branch) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1776 | | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1777 | | o d9e379a8c432 C-F (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1778 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1779 +---o 51c544a58128 C-C (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1780 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1781 | o a9149a1428e2 C-B (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1782 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1783 o | 98217d5a1659 C-A (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1784 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1785 o 842e2fac6304 C-ROOT (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1786 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1787 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1788 Creating changesets and markers |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1789 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1790 (new topo branch obsoleting that same head) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1791 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1792 $ hg -R client-other/ up 'desc("C-Q")' |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1793 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1794 $ echo bbb >> client-other/a |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1795 $ hg -R client-other/ branch --force default |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1796 marked working directory as branch default |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1797 $ hg -R client-other/ commit -m "C-W" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
1798 1 new orphan changesets |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1799 created new head |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1800 $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'` |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1801 $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'` |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1802 $ hg -R client-other debugobsolete $ID_V $ID_W |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33314
diff
changeset
|
1803 obsoleted 1 changesets |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1804 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1805 (continue the same head) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1806 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1807 $ echo aaa >> client-racy/a |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1808 $ hg -R client-racy/ commit -m "C-X" |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1809 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1810 Pushing |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1811 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1812 $ hg -R client-racy push -r 'tip' > ./push-log 2>&1 & |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1813 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1814 $ waiton $TESTTMP/readyfile |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1815 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1816 $ hg -R client-other push -fr 'tip' --new-branch |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1817 pushing to ssh://user@dummy/server |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1818 searching for changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1819 remote: adding changesets |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1820 remote: adding manifests |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1821 remote: adding file changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1822 remote: added 1 changesets with 0 changes to 1 files (+1 heads) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1823 remote: 1 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32892
diff
changeset
|
1824 remote: obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35508
diff
changeset
|
1825 remote: 1 new orphan changesets |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1826 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1827 $ release $TESTTMP/watchfile |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1828 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1829 Check the result of the push |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1830 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1831 $ cat ./push-log |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1832 pushing to ssh://user@dummy/server |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1833 searching for changes |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1834 wrote ready: $TESTTMP/readyfile |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1835 waiting on: $TESTTMP/watchfile |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1836 abort: push failed: |
40147
58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Taapas Agrawal <taapas2897@gmail.com>
parents:
39707
diff
changeset
|
1837 'remote repository changed while pushing - please try again' |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1838 |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1839 $ hg -R server debugobsolete |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1840 b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1841 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1842 $ hg -R server graph --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
34865
diff
changeset
|
1843 * 39bc0598afe9 C-W (default) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1844 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
34865
diff
changeset
|
1845 | * a98a47d8b85b C-U (default) |
32670
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1846 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1847 x b0ee3d6f51bc C-Q (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1848 | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1849 | o 3d57ed3c1091 C-T (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1850 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1851 | o 2efd43f7b5ba C-S (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1852 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1853 | | o de7b9e2ba3f6 C-R (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1854 | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1855 | o 1b58ee3f79e5 C-P (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1856 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1857 | o d0a85b2252a9 C-O (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1858 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1859 | x 720c5163ecf6 C-V (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1860 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1861 o 55a6f1c01b48 C-Z (other) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1862 | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1863 o 866a66e18630 C-N (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1864 |\ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1865 +---o 6fd3090135df C-M (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1866 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1867 | o cac2cead0ff0 C-L (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1868 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1869 o | be705100c623 C-K (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1870 |\| |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1871 o | d603e2c0cdd7 C-E (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1872 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1873 | o 59e76faf78bd C-D (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1874 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1875 | | o 89420bf00fae C-J (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1876 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1877 | | | o b35ed749f288 C-I (my-second-test-branch) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1878 | | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1879 | | o 75d69cba5402 C-G (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1880 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1881 | | | o 833be552cfe6 C-H (my-first-test-branch) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1882 | | |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1883 | | o d9e379a8c432 C-F (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1884 | | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1885 +---o 51c544a58128 C-C (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1886 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1887 | o a9149a1428e2 C-B (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1888 | | |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1889 o | 98217d5a1659 C-A (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1890 |/ |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1891 o 842e2fac6304 C-ROOT (default) |
41b8cfe85383
test: add a push race case where the updated head is obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32669
diff
changeset
|
1892 |