annotate tests/test-bookmarks-push-race.t @ 52316:a820a7a1fce0 default tip

setup: require TLS 1.2 support from the Python interpreter (BC) Before it was optional, and either 1.1 or 1.2 was sufficient. Now that the default minimum is 1.2, it needs to be present to work out of the box. The code here is more convoluted than the corresponding checks in `sslutil.py`, but I'm leaving it alone because it can all be simplified when py38 is dropped.
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 21 Nov 2024 11:46:10 -0500
parents 553eb132366f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
51636
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 ============================================
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
2 Testing various race condition while pushing
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
3 ============================================
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
4
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
5 $ cat << EOF >> $HGRCPATH
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
6 > [command-templates]
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
7 > log={rev}:{node|short} {desc|firstline} {bookmarks}
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
8 > [ui]
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
9 > timeout = 20
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
10 > [phases]
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
11 > publish=False
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
12 > EOF
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
13
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
14 Initial Setup
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
15 =============
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
16
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
17 $ hg init dst
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
18 $ echo a > dst/a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
19 $ hg --cwd dst add a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
20 $ hg --cwd dst commit -m root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
21 $ hg --cwd dst bookmark my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
22 $ hg --cwd dst bookmarks
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
23 * my-book 0:a64e49638499
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
24 $ hg --cwd dst log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
25 @ 0:a64e49638499 root my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
26
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
27
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
28 $ hg clone ssh://user@dummy/dst src
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
29 requesting all changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
30 adding changesets
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
31 adding manifests
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
32 adding file changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
33 added 1 changesets with 1 changes to 1 files
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
34 new changesets a64e49638499 (1 drafts)
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
35 updating to branch default
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
37 $ hg --cwd src update my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
38 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
39 (activating bookmark my-book)
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
40 $ hg --cwd src log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
41 @ 0:a64e49638499 root my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
42
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
43
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
44 $ echo b > src/a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
45 $ hg --cwd src commit -m cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
46 $ hg --cwd src log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
47 @ 1:e89d3a6ed79b cA0_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
48 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
49 o 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
50
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
51
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
52 Race condition while pushing a forward moving bookmarks
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
53 =======================================================
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
54
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
55 This is currently slightly broken as we eventually don't push the bookmark.
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
56 However at least we do not delete the remote one.
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
57
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
58 $ echo c > src/a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
59 $ hg --cwd src push -B my-book --config hooks.prelock="hg commit -m cA1_"
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
60 pushing to ssh://user@dummy/dst
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
61 searching for changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
62 remote: adding changesets
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
63 remote: adding manifests
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
64 remote: adding file changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
65 remote: added 1 changesets with 1 changes to 1 files
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
66 $ hg --cwd src log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
67 @ 2:08d837bbfe8d cA1_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
68 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
69 o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
70 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
71 o 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
72
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
73 $ hg --cwd dst log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
74 o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
75 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
76 @ 0:a64e49638499 root my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
77
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
78
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
79 create a side-moving bookmark
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
80 Race condition while pushing a side moving bookmarks
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
81 =======================================================
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
82
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
83 resynchronize the repo and setup test
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
84 -------------------------------------
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
85
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
86 $ hg --cwd src push -B my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
87 pushing to ssh://user@dummy/dst
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
88 searching for changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
89 remote: adding changesets
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
90 remote: adding manifests
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
91 remote: adding file changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
92 remote: added 1 changesets with 1 changes to 1 files
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
93 updating bookmark my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
94 $ hg --cwd dst log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
95 o 2:08d837bbfe8d cA1_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
96 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
97 o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
98 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
99 @ 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
100
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
101
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
102 $ hg --cwd src up 'desc("root")'
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
104 (leaving bookmark my-book)
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
105 $ echo d > src/a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
106 $ hg --cwd src commit -m cB0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
107 created new head
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
108 $ hg --cwd src bookmark --force my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
109 $ echo e > src/a-file
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
110 $ hg --cwd src log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
111 @ 3:726401661fe5 cB0_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
112 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
113 | o 2:08d837bbfe8d cA1_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
114 | |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
115 | o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
116 |/
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
117 o 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
118
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
119
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
120 Push the bookmark while a commit is being made
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
121 ----------------------------------------------
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
122
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
123 This is currently slightly broken as we eventually don't push the bookmark.
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
124 However at least we do not delete the remote one.
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
125
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
126 $ hg --cwd src push -f -r 'desc("cB0_")' -B my-book --config hooks.prelock="hg commit -m cB1_"
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
127 pushing to ssh://user@dummy/dst
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
128 searching for changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
129 remote: adding changesets
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
130 remote: adding manifests
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
131 remote: adding file changes
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
132 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
133 $ hg --cwd src log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
134 @ 4:a7f9cbf631a0 cB1_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
135 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
136 o 3:726401661fe5 cB0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
137 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
138 | o 2:08d837bbfe8d cA1_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
139 | |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
140 | o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
141 |/
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
142 o 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
143
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
144
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
145 $ hg --cwd dst log -G
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
146 o 3:726401661fe5 cB0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
147 |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
148 | o 2:08d837bbfe8d cA1_ my-book
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
149 | |
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
150 | o 1:e89d3a6ed79b cA0_
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
151 |/
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
152 @ 0:a64e49638499 root
553eb132366f bookmark: fix remote bookmark deletion when the push is raced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
153