Mercurial > hg
annotate tests/test-push-race.t @ 34661:eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 12 Oct 2017 09:39:50 +0200 |
parents | 30ae924a9e00 |
children | 6338e23c887d |
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, |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 > ) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 > 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
|
28 > # notify we are done preparing |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
29 > ui = pushop.repo.ui |
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
30 > readypath = ui.config('delaypush', 'ready-path', None) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 > 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
|
32 > 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
|
33 > r.write('foo') |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
34 > ui.status('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
|
35 > # now wait for the other process to be done |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
36 > watchpath = ui.config('delaypush', 'release-path', None) |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 > if watchpath is not None: |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
38 > ui.status('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
|
39 > limit = 100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 > 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
|
41 > limit -= 1 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 > 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
|
43 > if limit <= 0: |
33314
7d8d2da4516c
tests: fix reference to undefined variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
33262
diff
changeset
|
44 > ui.warn('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
|
45 > else: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 > # 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
|
47 > def delete(): |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 > try: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 > 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
|
50 > 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
|
51 > 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
|
52 > raise |
34507
30ae924a9e00
test-push-race: use 'ui.atexit' instead of python's 'atexit'
Saurabh Singh <singhsrb@fb.com>
parents:
33773
diff
changeset
|
53 > 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
|
54 > 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
|
55 > |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 > def uisetup(ui): |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 > extensions.wrapfunction(exchange, '_pushbundle2', delaypush) |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 $ waiton () { |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 > # 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
|
62 > count=100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 > 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
|
64 > do |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 > 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
|
66 > 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
|
67 > 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
|
68 > then |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 > break |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 > fi; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 > done |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 > [ -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
|
73 > 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
|
74 > } |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 $ release () { |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 > # 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
|
78 > count=100 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 > touch $1 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 > 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
|
81 > do |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 > 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
|
83 > 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
|
84 > 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
|
85 > then |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 > break |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 > fi; |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 > done |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 > [ ! -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
|
90 > } |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 $ 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
|
93 > [ui] |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
33252
diff
changeset
|
94 > 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
|
95 > # simplify output |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 > 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
|
97 > [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
|
98 > 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
|
99 > [experimental] |
33773
6c1a9fd8361b
test: update evolution config
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
100 > stabilization = all |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 > [alias] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
102 > 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
|
103 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
104 |
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
|
105 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
|
106 * 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
|
107 * 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
|
108 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
109 #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
|
110 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
111 #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
|
112 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
113 $ 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
|
114 > [server] |
a7851519ea02
check-concurrency: expose the feature as 'concurrent-push-mode'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32709
diff
changeset
|
115 > 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
|
116 > 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
|
117 |
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 #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
|
119 |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
120 Setup |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
121 ----- |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
122 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
123 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
|
124 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 $ 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
|
126 $ cd server |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
127 $ 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
|
128 $ 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
|
129 adding root |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
130 $ cd .. |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
131 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
132 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
|
133 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
134 $ 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
|
135 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
|
136 adding changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 adding manifests |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 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
|
139 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
140 new changesets 842e2fac6304 |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 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
|
142 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
|
143 $ 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
|
144 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
|
145 adding changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
146 adding manifests |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 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
|
148 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
149 new changesets 842e2fac6304 |
32630
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 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
|
151 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
|
152 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 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
|
154 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 $ 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
|
156 > [extensions] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
157 > 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
|
158 > [delaypush] |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
159 > 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
|
160 > 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
|
161 > EOF |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
163 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
|
164 ------------------------------------------------------------ |
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 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
|
167 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 # a |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
169 # | b |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
170 # |/ |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
171 # * |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
172 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
173 Creating changesets |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
174 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
175 $ 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
|
176 $ 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
|
177 $ 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
|
178 $ 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
|
179 $ 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
|
180 $ 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
|
181 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
182 Pushing |
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 $ 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
|
185 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
186 $ 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
|
187 |
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 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
|
189 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
|
190 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
|
191 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
|
192 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
|
193 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
|
194 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
|
195 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
196 $ 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
|
197 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
198 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
|
199 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
200 $ 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
|
201 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
|
202 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
|
203 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
|
204 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
|
205 abort: push failed: |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
206 'repository changed while pushing - please try again' |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
207 |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
208 $ 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
|
209 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
|
210 | |
53f47cc085d8
test: add a file dedicated to push race between clients
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
211 @ 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
|
212 |
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
|
213 |
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
|
214 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
|
215 ------------------------------ |
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
|
216 |
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
|
217 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
|
218 |
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
|
219 # 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
|
220 # | | |
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
|
221 # * * |
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
|
222 # |/ |
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
|
223 # * |
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 (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
|
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 $ 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
|
228 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
|
229 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
|
230 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
|
231 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
|
232 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
|
233 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
234 new changesets a9149a1428e2 |
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
|
235 (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
|
236 $ 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
|
237 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
|
238 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
|
239 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
|
240 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
|
241 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
|
242 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
243 new changesets a9149a1428e2 |
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
|
244 (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
|
245 $ 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
|
246 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
|
247 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
|
248 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
|
249 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
|
250 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
|
251 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
252 new changesets 98217d5a1659 |
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
|
253 (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
|
254 |
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 $ 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
|
256 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
|
257 | |
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 | 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
|
259 |/ |
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 @ 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
|
261 |
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 |
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
|
263 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
|
264 |
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 $ 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
|
266 $ 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
|
267 $ 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
|
268 $ 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
|
269 |
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 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
|
271 |
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 $ 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
|
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 $ 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
|
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 $ 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
|
277 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
|
278 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
|
279 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
|
280 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
|
281 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
|
282 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
|
283 |
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 $ 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
|
285 |
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 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
|
287 |
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
|
288 #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
|
289 $ 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
|
290 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
|
291 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
|
292 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
|
293 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
|
294 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 $ 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
|
298 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
|
299 | |
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 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
|
301 | |
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 | 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
|
303 |/ |
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 @ 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
|
305 |
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
|
306 #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
|
307 #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
|
308 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
309 (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
|
310 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
311 $ 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
|
312 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
|
313 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
|
314 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
|
315 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
|
316 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
|
317 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
|
318 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
|
319 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
|
320 |
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 $ 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
|
322 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
|
323 | |
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 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
|
325 | |
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 | 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
|
327 | | |
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 | 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
|
329 |/ |
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 @ 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
|
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 #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
|
333 |
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
|
334 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
|
335 ----------------------------------------- |
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
|
336 |
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
|
337 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
|
338 |
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
|
339 # 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
|
340 # | |
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
|
341 # * 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
|
342 # |/ |
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
|
343 # * |
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
|
344 |
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 (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
|
346 |
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
|
347 #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
|
348 |
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
|
349 $ 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
|
350 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
|
351 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
|
352 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
|
353 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
|
354 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
|
355 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
356 new changesets 59e76faf78bd |
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
|
357 (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
|
358 |
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 #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
|
360 #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
|
361 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
362 $ 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
|
363 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
|
364 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
|
365 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
|
366 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
367 #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
|
368 |
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
|
369 $ 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
|
370 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
|
371 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
|
372 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
|
373 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
|
374 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
|
375 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
376 new changesets 59e76faf78bd |
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
|
377 (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
|
378 $ 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
|
379 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
|
380 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
|
381 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
|
382 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
|
383 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
|
384 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
385 new changesets 51c544a58128 |
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
|
386 (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
|
387 |
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 $ 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
|
389 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
|
390 | |
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 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
|
392 | |
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 | 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
|
394 | | |
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 | 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
|
396 |/ |
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 @ 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
|
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 |
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 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
|
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 (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
|
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 $ 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
|
405 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
|
406 $ 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
|
407 $ 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
|
408 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
|
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 (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
|
411 |
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 $ 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
|
413 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
|
414 $ 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
|
415 $ 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
|
416 |
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 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
|
418 |
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 $ 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
|
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 $ 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
|
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-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
|
424 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
|
425 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
|
426 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
|
427 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
|
428 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
|
429 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
|
430 |
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 $ 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
|
432 |
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 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
|
434 |
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
|
435 #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
|
436 |
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
|
437 $ 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
446 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
|
447 | |
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 | 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
|
449 |/ |
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 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
|
451 | |
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 | 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
|
453 | | |
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
|
454 | 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
|
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 @ 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
|
457 |
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
|
458 |
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
|
459 #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
|
460 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
461 #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
|
462 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
463 (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
|
464 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
465 $ 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
|
466 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
|
467 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
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 |
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 $ 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
|
476 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
|
477 | |
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 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
|
479 | |
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 | 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
|
481 |/ |
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 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
|
483 | |
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 | 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
|
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 | 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
|
487 |/ |
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 @ 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
|
489 |
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 #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
|
491 |
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
|
492 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
|
493 --------------------------------------------------------------------- |
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
|
494 |
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
|
495 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
|
496 |
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
|
497 # 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
|
498 # | |
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
|
499 # | 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
|
500 # |/ |
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
|
501 # * |
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
|
502 |
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 (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
|
504 |
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
|
505 #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
|
506 |
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
|
507 $ 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
|
508 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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
514 new changesets d9e379a8c432 |
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
|
515 (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
|
516 |
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 #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
|
518 #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
|
519 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
520 $ 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
|
521 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
|
522 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
|
523 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
|
524 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
525 #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
|
526 |
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
|
527 $ 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
|
528 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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
534 new changesets d9e379a8c432 |
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
|
535 (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
|
536 $ 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
|
537 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
|
538 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
|
539 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
|
540 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
|
541 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
|
542 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
543 new changesets d603e2c0cdd7 |
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
|
544 (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
|
545 |
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 $ 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
|
547 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
|
548 | |
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 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
|
550 | |
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 | 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
|
552 |/ |
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 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
|
554 | |
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 | 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
|
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 | 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
|
558 |/ |
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 @ 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
|
560 |
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 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
|
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 (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
|
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 $ 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
|
567 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
|
568 $ 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
|
569 $ 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
|
570 |
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 (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
|
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 $ 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
|
574 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
|
575 $ 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
|
576 $ 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
|
577 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
|
578 (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
|
579 $ 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
|
580 |
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 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
|
582 |
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 $ 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
|
584 |
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 $ 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
|
586 |
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-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
|
588 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
|
589 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
|
590 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
|
591 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
|
592 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
|
593 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
|
594 |
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 $ 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
|
596 |
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 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
|
598 |
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
|
599 #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
|
600 $ 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
|
601 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
|
602 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
|
603 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
|
604 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
|
605 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 $ 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
|
609 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
|
610 | |
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 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
|
612 | |
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 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
|
614 | |
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 | 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
|
616 |/ |
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
|
617 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
|
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 | 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
|
620 | | |
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 | 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
|
622 |/ |
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 @ 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
|
624 |
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
|
625 #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
|
626 #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
|
627 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
628 (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
|
629 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
630 $ 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
|
631 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
|
632 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
|
633 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
|
634 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
|
635 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
|
636 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
|
637 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
|
638 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
|
639 |
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 $ 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
|
641 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
|
642 | |
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 | 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
|
644 |/ |
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 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
|
646 | |
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 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
|
648 | |
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 | 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
|
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 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
|
652 | |
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 | 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
|
654 | | |
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 | 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
|
656 |/ |
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 @ 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
|
658 |
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 #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
|
660 |
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 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
|
662 |
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
|
663 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
|
664 --------------------------------------------------------------------- |
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
|
665 |
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
|
666 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
|
667 |
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
|
668 # 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
|
669 # | |
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
|
670 # | 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
|
671 # |/ |
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
|
672 # * (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
|
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 (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
|
675 |
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
|
676 #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
|
677 |
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
|
678 $ 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
685 new changesets 833be552cfe6 |
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
|
686 (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
|
687 |
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 #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
|
689 #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
|
690 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
691 $ 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
|
692 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
|
693 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
|
694 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
|
695 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
696 #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
|
697 |
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
|
698 $ 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
|
699 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
|
700 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
|
701 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
|
702 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
|
703 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
|
704 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
705 new changesets 833be552cfe6 |
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
|
706 (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
|
707 $ 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
|
708 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
|
709 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
|
710 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
|
711 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
|
712 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
|
713 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
714 new changesets 75d69cba5402 |
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
|
715 (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
|
716 |
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 $ 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
|
718 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
|
719 | |
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 | 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
|
721 |/ |
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 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
|
723 | |
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 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
|
725 | |
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 | 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
|
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 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
|
729 | |
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 | 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
|
731 | | |
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 | 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
|
733 |/ |
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 @ 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
|
735 |
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 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
|
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 (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
|
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 $ 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
|
742 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
|
743 $ 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
|
744 $ 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
|
745 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
|
746 $ 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
|
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 (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
|
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 $ 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
|
751 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
|
752 $ 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
|
753 $ 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
|
754 |
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 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
|
756 |
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-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
|
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 $ 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
|
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-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
|
762 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
|
763 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
|
764 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
|
765 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
|
766 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
|
767 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
|
768 |
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 $ 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
|
770 |
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 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
|
772 |
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
|
773 #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
|
774 |
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
|
775 $ 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
|
776 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
|
777 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
|
778 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
|
779 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
|
780 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
784 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
|
785 | |
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 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
|
787 | |
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 | 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
|
789 |/ |
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 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
|
791 | |
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
|
792 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
|
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 | 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
|
795 |/ |
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 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
|
797 | |
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 | 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
|
799 | | |
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 | 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
|
801 |/ |
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 @ 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
|
803 |
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
|
804 |
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
|
805 #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
|
806 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
807 #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
|
808 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
809 (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
|
810 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
811 $ 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
|
812 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
|
813 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
|
814 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
|
815 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
|
816 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
|
817 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
|
818 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
|
819 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
|
820 |
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 $ 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
|
822 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
|
823 | |
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 | 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
|
825 |/ |
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 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
|
827 | |
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 | 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
|
829 |/ |
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 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
|
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 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
|
833 | |
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 | 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
|
835 |/ |
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 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
|
837 | |
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 | 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
|
839 | | |
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 | 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
|
841 |/ |
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 @ 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
|
843 |
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 #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
|
846 |
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
|
847 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
|
848 ---------------------------------------- |
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
|
849 |
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
|
850 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
|
851 |
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
|
852 # 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
|
853 # | 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
|
854 # |/| |
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
|
855 # * * |
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
|
856 # |/ |
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
|
857 # * |
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 |
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 (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
|
860 |
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
|
861 #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
|
862 |
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
|
863 $ 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
|
864 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
|
865 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
|
866 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
|
867 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
|
868 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
|
869 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
870 new changesets 89420bf00fae |
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
|
871 (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
|
872 |
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 #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
|
874 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
875 #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
|
876 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
877 $ 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
|
878 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
|
879 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
|
880 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
|
881 |
16ada4cbb1a9
push: add a way to allow concurrent pushes on unrelated heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32670
diff
changeset
|
882 #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
|
883 |
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
|
884 $ 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
|
885 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
|
886 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
|
887 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
|
888 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
|
889 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
|
890 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
891 new changesets 89420bf00fae |
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
|
892 (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
|
893 $ 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
|
894 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
|
895 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
|
896 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
|
897 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
|
898 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
|
899 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
900 new changesets b35ed749f288 |
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
|
901 (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
|
902 |
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 $ 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
|
904 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
|
905 | |
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 | 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
|
907 |/ |
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 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
|
909 | |
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 | 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
|
911 |/ |
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 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
|
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 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
|
915 | |
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 | 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
|
917 |/ |
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 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
|
919 | |
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 | 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
|
921 | | |
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 | 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
|
923 |/ |
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 @ 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
|
925 |
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 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
|
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 (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
|
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 $ 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
|
932 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
|
933 $ 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
|
934 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
|
935 (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
|
936 $ 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
|
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 (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
|
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 $ 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
|
941 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
|
942 $ 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
|
943 $ 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
|
944 |
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 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
|
946 |
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-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
|
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 $ 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
|
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-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
|
952 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
|
953 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
|
954 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
|
955 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
|
956 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
|
957 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
|
958 |
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 $ 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
|
960 |
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 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
|
962 |
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 $ 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
|
964 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
|
965 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
|
966 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
|
967 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
|
968 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
972 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
|
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 | 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
|
975 | | |
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 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
|
977 | | |
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 | | 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
|
979 | | | |
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
|
980 | | | 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
|
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 | | 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
|
983 | | | |
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 | | | 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
|
985 | | |/ |
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 | | 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
|
987 | | | |
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 | | 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
|
989 | |/ |
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 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
|
991 | | |
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 | 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
|
993 |/ |
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 @ 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
|
995 |
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
|
996 |
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
|
997 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
|
998 --------------------------------------- |
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
|
999 |
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
|
1000 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
|
1001 |
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
|
1002 # 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
|
1003 # | 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
|
1004 # |/| |
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
|
1005 # * * |
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
|
1006 # |/ |
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 |
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 (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
|
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 $ 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
|
1012 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
|
1013 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
|
1014 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
|
1015 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
|
1016 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
|
1017 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1018 new changesets cac2cead0ff0 |
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
|
1019 (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
|
1020 $ 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
|
1021 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
|
1022 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
|
1023 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
|
1024 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
|
1025 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
|
1026 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1027 new changesets cac2cead0ff0 |
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
|
1028 (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
|
1029 $ 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
|
1030 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
|
1031 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
|
1032 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
|
1033 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
|
1034 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
|
1035 added 1 changesets with 0 changes to 0 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1036 new changesets be705100c623 |
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
|
1037 (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
|
1038 |
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 $ 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
|
1040 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
|
1041 | |
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 | 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
|
1043 |/| |
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 | 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
|
1045 | | |
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 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
|
1047 | | |
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 | | 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
|
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 | | | 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
|
1051 | | |/ |
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 | | 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
|
1053 | | | |
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 | | | 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
|
1055 | | |/ |
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 | | 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
|
1057 | | | |
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 | | 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
|
1059 | |/ |
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 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
|
1061 | | |
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 | 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
|
1063 |/ |
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 @ 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
|
1065 |
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 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
|
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 (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
|
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 $ 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
|
1072 $ 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
|
1073 |
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 (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
|
1075 |
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 $ 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
|
1077 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
|
1078 (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
|
1079 $ 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
|
1080 |
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 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
|
1082 |
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-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
|
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 $ 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
|
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-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
|
1088 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
|
1089 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
|
1090 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
|
1091 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
|
1092 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
|
1093 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
|
1094 |
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 $ 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
|
1096 |
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 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
|
1098 |
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 $ 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
|
1100 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
|
1101 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
|
1102 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
|
1103 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
|
1104 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
1108 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
|
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 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
|
1111 |\ |
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 | 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
|
1113 | | |
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 +---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
|
1115 | | |
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
|
1116 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
|
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 | | 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
|
1119 | | | |
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 | | | 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
|
1121 | | |/ |
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 | | 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
|
1123 | | | |
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 | | | 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
|
1125 | | |/ |
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 | | 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
|
1127 | | | |
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 | | 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
|
1129 | |/ |
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 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
|
1131 | | |
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 | 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
|
1133 |/ |
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 @ 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
|
1135 |
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
|
1136 |
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
|
1137 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
|
1138 --------------------------------------------------------- |
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
|
1139 |
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
|
1140 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
|
1141 |
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
|
1142 # 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
|
1143 # | |
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
|
1144 # 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
|
1145 # | |
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
|
1146 # | 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
|
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 # * (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
|
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 # * (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
|
1151 |
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 (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
|
1153 |
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 $ 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
|
1155 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
|
1156 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
|
1157 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
|
1158 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
|
1159 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
|
1160 added 1 changesets with 0 changes to 0 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1161 new changesets 866a66e18630 |
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
|
1162 (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
|
1163 |
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 (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
|
1165 |
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 $ 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
|
1167 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
|
1168 $ 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
|
1169 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
|
1170 $ 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
|
1171 $ 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
|
1172 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
|
1173 |
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 (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
|
1175 |
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 $ 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
|
1177 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
|
1178 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
|
1179 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
|
1180 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
|
1181 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
|
1182 added 2 changesets with 0 changes to 0 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1183 new changesets 866a66e18630:55a6f1c01b48 |
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
|
1184 (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
|
1185 $ 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 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
|
1191 added 2 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1192 new changesets 6fd3090135df:55a6f1c01b48 |
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
|
1193 (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
|
1194 |
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 $ 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
|
1196 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
|
1197 | |
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 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
|
1199 |\ |
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 +---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
|
1201 | | |
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 | 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
|
1203 | | |
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 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
|
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 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
|
1207 | | |
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 | 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
|
1209 | | |
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 | | 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
|
1211 | | | |
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 | | | 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
|
1213 | | |/ |
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 | | 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
|
1215 | | | |
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 | | | 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
|
1217 | | |/ |
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 | | 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
|
1219 | | | |
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 +---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
|
1221 | | |
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 | 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
|
1223 | | |
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 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
|
1225 |/ |
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 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
|
1227 |
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 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
|
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 (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
|
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 $ 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
|
1234 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
|
1235 $ 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
|
1236 $ 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
|
1237 $ 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
|
1238 $ 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
|
1239 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
|
1240 $ 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
|
1241 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
|
1242 |
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 (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
|
1244 |
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 $ 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
|
1246 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
|
1247 $ 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
|
1248 $ 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
|
1249 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
|
1250 $ 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
|
1251 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
|
1252 |
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 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
|
1254 |
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 $ 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
|
1256 |
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 $ 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
|
1258 |
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-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
|
1260 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
|
1261 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
|
1262 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
|
1263 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
|
1264 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
|
1265 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
|
1266 |
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 $ 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
|
1268 |
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 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
|
1270 |
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 $ 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
|
1272 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
|
1273 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
|
1274 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
|
1275 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
|
1276 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
1280 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
|
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 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
|
1283 | |
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 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
|
1285 | |
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 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
|
1287 |\ |
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
|
1288 +---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
|
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 | 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
|
1291 | | |
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 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
|
1293 |\| |
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 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
|
1295 | | |
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 | 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
|
1297 | | |
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 | | 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
|
1299 | | | |
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 | | | 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
|
1301 | | |/ |
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 | | 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
|
1303 | | | |
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 | | | 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
|
1305 | | |/ |
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 | | 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
|
1307 | | | |
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 +---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
|
1309 | | |
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 | 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
|
1311 | | |
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 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
|
1313 |/ |
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 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
|
1315 |
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
|
1316 |
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
|
1317 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
|
1318 --------------------------------------------------------- |
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
|
1319 |
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
|
1320 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
|
1321 |
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
|
1322 # 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
|
1323 # | |
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
|
1324 # 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
|
1325 # | |
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
|
1326 # | 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
|
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 # * (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
|
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 # * (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
|
1331 |
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 (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
|
1333 |
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 $ 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
|
1335 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
|
1336 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
|
1337 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
|
1338 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
|
1339 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
|
1340 added 1 changesets with 0 changes to 0 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1341 new changesets b0ee3d6f51bc |
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
|
1342 (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
|
1343 $ 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
|
1344 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
|
1345 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
|
1346 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
|
1347 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
|
1348 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
|
1349 added 1 changesets with 0 changes to 0 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1350 new changesets b0ee3d6f51bc |
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
|
1351 (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
|
1352 $ 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
|
1353 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
|
1354 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
|
1355 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
|
1356 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
|
1357 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
|
1358 added 2 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1359 new changesets d0a85b2252a9:1b58ee3f79e5 |
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
|
1360 (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
|
1361 |
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 $ 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
|
1363 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
|
1364 | |
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 | 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
|
1366 | | |
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 | 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
|
1368 |/ |
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 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
|
1370 | |
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 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
|
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 +---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
|
1374 | | |
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 | 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
|
1376 | | |
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 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
|
1378 |\| |
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 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
|
1380 | | |
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 | 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
|
1382 | | |
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 | | 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
|
1384 | | | |
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 | | | 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
|
1386 | | |/ |
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 | | 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
|
1388 | | | |
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 | | | 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
|
1390 | | |/ |
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 | | 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
|
1392 | | | |
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 +---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
|
1394 | | |
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 | 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
|
1396 | | |
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 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
|
1398 |/ |
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 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
|
1400 |
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 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
|
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 (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
|
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 $ 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
|
1407 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
|
1408 $ 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
|
1409 $ 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
|
1410 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
|
1411 $ 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
|
1412 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
|
1413 |
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 (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
|
1415 |
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 $ 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
|
1417 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
|
1418 $ 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
|
1419 $ 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
|
1420 $ 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
|
1421 $ 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
|
1422 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
|
1423 $ 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
|
1424 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
|
1425 |
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 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
|
1427 |
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 $ 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
|
1429 |
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 $ 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
|
1431 |
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-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
|
1433 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
|
1434 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
|
1435 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
|
1436 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
|
1437 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
|
1438 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
|
1439 |
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 $ 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
|
1441 |
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 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
|
1443 |
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 $ 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
|
1445 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
|
1446 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
|
1447 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
|
1448 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
|
1449 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
1453 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
|
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 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
|
1456 | |
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 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
|
1458 | |
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 | 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
|
1460 |/ |
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
|
1461 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
|
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 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
|
1464 |\ |
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 +---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
|
1466 | | |
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 | 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
|
1468 | | |
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 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
|
1470 |\| |
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 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
|
1472 | | |
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 | 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
|
1474 | | |
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 | | 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
|
1476 | | | |
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 | | | 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
|
1478 | | |/ |
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 | | 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
|
1480 | | | |
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 | | | 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
|
1482 | | |/ |
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 | | 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
|
1484 | | | |
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 +---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
|
1486 | | |
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 | 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
|
1488 | | |
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 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
|
1490 |/ |
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 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
|
1492 |
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
|
1493 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1494 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
|
1495 -------------------------------------------------------------------------- |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1496 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1497 # 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
|
1498 # | |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1499 # ø⇠◔ 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
|
1500 # |/ |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1501 # * |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1502 |
6ac367b6ae8a
test: add a push race case where obsoleted head is updated
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32638
diff
changeset
|
1503 (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
|
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 $ 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
|
1506 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
|
1507 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
|
1508 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
|
1509 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
|
1510 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
|
1511 added 2 changesets with 2 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1512 new changesets 2efd43f7b5ba:3d57ed3c1091 |
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
|
1513 (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
|
1514 $ 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
|
1515 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
|
1516 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
|
1517 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
|
1518 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
|
1519 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
|
1520 added 2 changesets with 2 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1521 new changesets 2efd43f7b5ba:3d57ed3c1091 |
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
|
1522 (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
|
1523 $ 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
|
1524 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
|
1525 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
|
1526 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
|
1527 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
|
1528 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
|
1529 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1530 new changesets de7b9e2ba3f6 |
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
|
1531 (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
|
1532 |
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 $ 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
|
1534 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
|
1535 | |
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 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
|
1537 | |
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 | 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
|
1539 |/ |
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 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
|
1541 | |
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 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
|
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 | 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
|
1545 |/ |
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 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
|
1547 | |
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 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
|
1549 |\ |
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 +---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
|
1551 | | |
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 | 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
|
1553 | | |
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 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
|
1555 |\| |
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 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
|
1557 | | |
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 | 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
|
1559 | | |
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 | | 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
|
1561 | | | |
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 | | | 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
|
1563 | | |/ |
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 | | 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
|
1565 | | | |
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 | | | 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
|
1567 | | |/ |
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 | | 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
|
1569 | | | |
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 +---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
|
1571 | | |
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 | 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
|
1573 | | |
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 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
|
1575 |/ |
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 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
|
1577 |
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 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
|
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 (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
|
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 $ 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
|
1584 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
|
1585 $ 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
|
1586 $ 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
|
1587 |
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 (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
|
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 $ 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
|
1591 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
|
1592 $ 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
|
1593 $ 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
|
1594 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
|
1595 $ 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
|
1596 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
|
1597 $ 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
|
1598 $ 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
|
1599 $ 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
|
1600 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
|
1601 |
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 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
|
1603 |
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 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
|
1605 |
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 $ 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
|
1607 |
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 $ 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
|
1609 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
|
1610 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
|
1611 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
|
1612 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
|
1613 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
|
1614 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
|
1615 |
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 $ 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
|
1617 |
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 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
|
1619 |
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 $ 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
|
1621 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
|
1622 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
|
1623 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
|
1624 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
|
1625 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
1629 $ 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
|
1630 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
|
1631 | |
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 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
|
1633 | |
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 | 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
|
1635 | | |
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 | 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
|
1637 | | |
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 | | 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
|
1639 | |/ |
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 | 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
|
1641 | | |
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 | 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
|
1643 |/ |
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 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
|
1645 | |
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 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
|
1647 |\ |
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 +---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
|
1649 | | |
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 | 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
|
1651 | | |
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 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
|
1653 |\| |
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 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
|
1655 | | |
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 | 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
|
1657 | | |
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 | | 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
|
1659 | | | |
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 | | | 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
|
1661 | | |/ |
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 | | 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
|
1663 | | | |
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 | | | 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
|
1665 | | |/ |
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 | | 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
|
1667 | | | |
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 +---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
|
1669 | | |
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 | 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
|
1671 | | |
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 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
|
1673 |/ |
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 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
|
1675 |
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
|
1676 |
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
|
1677 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
|
1678 -------------------------------------------------------------------------- |
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
|
1679 |
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
|
1680 (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
|
1681 |
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
|
1682 # 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
|
1683 # | |
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
|
1684 # ø⇠◔ 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
|
1685 # |/ |
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
|
1686 # * |
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 (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
|
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 $ 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
|
1691 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
|
1692 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
|
1693 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
|
1694 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
|
1695 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
|
1696 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
|
1697 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
|
1698 obsoleted 1 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1699 new changesets 720c5163ecf6 |
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
|
1700 (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
|
1701 $ 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
|
1702 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
|
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 |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1710 new changesets 720c5163ecf6 |
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
|
1711 (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
|
1712 $ 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
|
1713 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
|
1714 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
|
1715 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
|
1716 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
|
1717 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
|
1718 added 1 changesets with 0 changes to 0 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34507
diff
changeset
|
1719 new changesets a98a47d8b85b |
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
|
1720 (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
|
1721 |
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
|
1722 $ 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
|
1723 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
|
1724 $ 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
|
1725 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
|
1726 | |
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 | o a98a47d8b85b C-U (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
|
1728 | | |
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 | 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
|
1730 |/ |
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 | 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
|
1732 | | |
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
|
1733 | 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
|
1734 | | |
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 | | 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
|
1736 | |/ |
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 | 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
|
1738 | | |
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 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
|
1740 |/ |
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
|
1741 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
|
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 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
|
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 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
|
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 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
|
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 | 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
|
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 | 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 | 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
|
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 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
|
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 |
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 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
|
1775 |
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 (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
|
1777 |
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 $ 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
|
1779 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
|
1780 $ 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
|
1781 $ 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
|
1782 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
|
1783 $ hg -R client-other/ commit -m "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
|
1784 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
|
1785 $ 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
|
1786 $ 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
|
1787 $ 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
|
1788 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
|
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 (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
|
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 $ 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
|
1793 $ 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
|
1794 |
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 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
|
1796 |
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-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
|
1798 |
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 $ 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
|
1800 |
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 $ 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
|
1802 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
|
1803 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
|
1804 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
|
1805 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
|
1806 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
|
1807 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
|
1808 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
|
1809 remote: 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
|
1810 |
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 $ 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
|
1812 |
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 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
|
1814 |
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 $ 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
|
1816 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
|
1817 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
|
1818 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
|
1819 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
|
1820 abort: push failed: |
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 'repository changed while pushing - please try again' |
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 |
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 $ 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
|
1824 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
|
1825 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
|
1826 $ hg -R server graph --hidden |
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 o 39bc0598afe9 C-W (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
|
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 | o a98a47d8b85b C-U (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
|
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 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
|
1832 | |
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 | 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
|
1834 | | |
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 | 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
|
1836 | | |
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
|
1837 | | 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
|
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 | 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
|
1840 | | |
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 | 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
|
1842 |/ |
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
|
1843 | 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
|
1844 |/ |
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
|
1845 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
|
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 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
|
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 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
|
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 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
|
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 | 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
|
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 | 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
|
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 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
|
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 | | 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 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
|
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 | 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
|
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 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
|
1876 |