Show More
@@ -1,335 +1,343 b'' | |||||
1 | Testing the functionality to pull remotenames |
|
1 | Testing the functionality to pull remotenames | |
2 | ============================================= |
|
2 | ============================================= | |
3 |
|
3 | |||
4 | $ cat >> $HGRCPATH << EOF |
|
4 | $ cat >> $HGRCPATH << EOF | |
|
5 | > [ui] | |||
|
6 | > ssh = $PYTHON "$TESTDIR/dummyssh" | |||
5 | > [alias] |
|
7 | > [alias] | |
6 | > glog = log -G -T '{rev}:{node|short} {desc}' |
|
8 | > glog = log -G -T '{rev}:{node|short} {desc}' | |
7 | > [experimental] |
|
9 | > [experimental] | |
8 | > remotenames = True |
|
10 | > remotenames = True | |
9 | > [extensions] |
|
11 | > [extensions] | |
10 | > remotenames = |
|
12 | > remotenames = | |
11 | > show = |
|
13 | > show = | |
12 | > EOF |
|
14 | > EOF | |
13 |
|
15 | |||
14 | Making a server repo |
|
16 | Making a server repo | |
15 | -------------------- |
|
17 | -------------------- | |
16 |
|
18 | |||
17 | $ hg init server |
|
19 | $ hg init server | |
18 | $ cd server |
|
20 | $ cd server | |
19 | $ for ch in a b c d e f g h; do |
|
21 | $ for ch in a b c d e f g h; do | |
20 | > echo "foo" >> $ch |
|
22 | > echo "foo" >> $ch | |
21 | > hg ci -Aqm "Added "$ch |
|
23 | > hg ci -Aqm "Added "$ch | |
22 | > done |
|
24 | > done | |
23 | $ hg glog |
|
25 | $ hg glog | |
24 | @ 7:ec2426147f0e Added h |
|
26 | @ 7:ec2426147f0e Added h | |
25 | | |
|
27 | | | |
26 | o 6:87d6d6676308 Added g |
|
28 | o 6:87d6d6676308 Added g | |
27 | | |
|
29 | | | |
28 | o 5:825660c69f0c Added f |
|
30 | o 5:825660c69f0c Added f | |
29 | | |
|
31 | | | |
30 | o 4:aa98ab95a928 Added e |
|
32 | o 4:aa98ab95a928 Added e | |
31 | | |
|
33 | | | |
32 | o 3:62615734edd5 Added d |
|
34 | o 3:62615734edd5 Added d | |
33 | | |
|
35 | | | |
34 | o 2:28ad74487de9 Added c |
|
36 | o 2:28ad74487de9 Added c | |
35 | | |
|
37 | | | |
36 | o 1:29becc82797a Added b |
|
38 | o 1:29becc82797a Added b | |
37 | | |
|
39 | | | |
38 | o 0:18d04c59bb5d Added a |
|
40 | o 0:18d04c59bb5d Added a | |
39 |
|
41 | |||
40 | $ hg bookmark -r 3 foo |
|
42 | $ hg bookmark -r 3 foo | |
41 | $ hg bookmark -r 6 bar |
|
43 | $ hg bookmark -r 6 bar | |
42 | $ hg up 4 |
|
44 | $ hg up 4 | |
43 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
45 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
44 | $ hg branch wat |
|
46 | $ hg branch wat | |
45 | marked working directory as branch wat |
|
47 | marked working directory as branch wat | |
46 | (branches are permanent and global, did you want a bookmark?) |
|
48 | (branches are permanent and global, did you want a bookmark?) | |
47 | $ echo foo >> bar |
|
49 | $ echo foo >> bar | |
48 | $ hg ci -Aqm "added bar" |
|
50 | $ hg ci -Aqm "added bar" | |
49 |
|
51 | |||
50 | Making a client repo |
|
52 | Making a client repo | |
51 | -------------------- |
|
53 | -------------------- | |
52 |
|
54 | |||
53 | $ cd .. |
|
55 | $ cd .. | |
54 |
|
56 | |||
55 |
$ hg clone |
|
57 | $ hg clone ssh://user@dummy/server client | |
|
58 | requesting all changes | |||
|
59 | adding changesets | |||
|
60 | adding manifests | |||
|
61 | adding file changes | |||
|
62 | added 9 changesets with 9 changes to 9 files (+1 heads) | |||
|
63 | new changesets 18d04c59bb5d:3e1487808078 | |||
56 | updating to branch default |
|
64 | updating to branch default | |
57 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
58 |
|
66 | |||
59 | $ cd client |
|
67 | $ cd client | |
60 | $ cat .hg/logexchange/bookmarks |
|
68 | $ cat .hg/logexchange/bookmarks | |
61 | 0 |
|
69 | 0 | |
62 |
|
70 | |||
63 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
71 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) | |
64 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
72 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) | |
65 |
|
73 | |||
66 | $ cat .hg/logexchange/branches |
|
74 | $ cat .hg/logexchange/branches | |
67 | 0 |
|
75 | 0 | |
68 |
|
76 | |||
69 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
77 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) | |
70 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
78 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) | |
71 |
|
79 | |||
72 | $ hg show work |
|
80 | $ hg show work | |
73 | o 3e14 (wat) (default/wat) added bar |
|
81 | o 3e14 (wat) (default/wat) added bar | |
74 | | |
|
82 | | | |
75 | ~ |
|
83 | ~ | |
76 | @ ec24 (default/default) Added h |
|
84 | @ ec24 (default/default) Added h | |
77 | | |
|
85 | | | |
78 | ~ |
|
86 | ~ | |
79 |
|
87 | |||
80 | $ hg update "default/wat" |
|
88 | $ hg update "default/wat" | |
81 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
89 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
82 | $ hg identify |
|
90 | $ hg identify | |
83 | 3e1487808078 (wat) tip |
|
91 | 3e1487808078 (wat) tip | |
84 |
|
92 | |||
85 | Making a new server |
|
93 | Making a new server | |
86 | ------------------- |
|
94 | ------------------- | |
87 |
|
95 | |||
88 | $ cd .. |
|
96 | $ cd .. | |
89 | $ hg init server2 |
|
97 | $ hg init server2 | |
90 | $ cd server2 |
|
98 | $ cd server2 | |
91 | $ hg pull ../server/ |
|
99 | $ hg pull ../server/ | |
92 | pulling from ../server/ |
|
100 | pulling from ../server/ | |
93 | requesting all changes |
|
101 | requesting all changes | |
94 | adding changesets |
|
102 | adding changesets | |
95 | adding manifests |
|
103 | adding manifests | |
96 | adding file changes |
|
104 | adding file changes | |
97 | added 9 changesets with 9 changes to 9 files (+1 heads) |
|
105 | added 9 changesets with 9 changes to 9 files (+1 heads) | |
98 | adding remote bookmark bar |
|
106 | adding remote bookmark bar | |
99 | adding remote bookmark foo |
|
107 | adding remote bookmark foo | |
100 | new changesets 18d04c59bb5d:3e1487808078 |
|
108 | new changesets 18d04c59bb5d:3e1487808078 | |
101 | (run 'hg heads' to see heads) |
|
109 | (run 'hg heads' to see heads) | |
102 |
|
110 | |||
103 | Pulling form the new server |
|
111 | Pulling form the new server | |
104 | --------------------------- |
|
112 | --------------------------- | |
105 | $ cd ../client/ |
|
113 | $ cd ../client/ | |
106 | $ hg pull ../server2/ |
|
114 | $ hg pull ../server2/ | |
107 | pulling from ../server2/ |
|
115 | pulling from ../server2/ | |
108 | searching for changes |
|
116 | searching for changes | |
109 | no changes found |
|
117 | no changes found | |
110 | $ cat .hg/logexchange/bookmarks |
|
118 | $ cat .hg/logexchange/bookmarks | |
111 | 0 |
|
119 | 0 | |
112 |
|
120 | |||
113 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
121 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) | |
114 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
122 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) | |
115 | 87d6d66763085b629e6d7ed56778c79827273022\x00$TESTTMP/server2\x00bar (esc) |
|
123 | 87d6d66763085b629e6d7ed56778c79827273022\x00$TESTTMP/server2\x00bar (esc) | |
116 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00$TESTTMP/server2\x00foo (esc) |
|
124 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00$TESTTMP/server2\x00foo (esc) | |
117 |
|
125 | |||
118 | $ cat .hg/logexchange/branches |
|
126 | $ cat .hg/logexchange/branches | |
119 | 0 |
|
127 | 0 | |
120 |
|
128 | |||
121 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
129 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) | |
122 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
130 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) | |
123 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc) |
|
131 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc) | |
124 | 3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc) |
|
132 | 3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc) | |
125 |
|
133 | |||
126 | $ hg log -G |
|
134 | $ hg log -G | |
127 | @ changeset: 8:3e1487808078 |
|
135 | @ changeset: 8:3e1487808078 | |
128 | | branch: wat |
|
136 | | branch: wat | |
129 | | tag: tip |
|
137 | | tag: tip | |
130 | | remote branch: $TESTTMP/server2/wat |
|
138 | | remote branch: $TESTTMP/server2/wat | |
131 | | remote branch: default/wat |
|
139 | | remote branch: default/wat | |
132 | | parent: 4:aa98ab95a928 |
|
140 | | parent: 4:aa98ab95a928 | |
133 | | user: test |
|
141 | | user: test | |
134 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
142 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
135 | | summary: added bar |
|
143 | | summary: added bar | |
136 | | |
|
144 | | | |
137 | | o changeset: 7:ec2426147f0e |
|
145 | | o changeset: 7:ec2426147f0e | |
138 | | | remote branch: $TESTTMP/server2/default |
|
146 | | | remote branch: $TESTTMP/server2/default | |
139 | | | remote branch: default/default |
|
147 | | | remote branch: default/default | |
140 | | | user: test |
|
148 | | | user: test | |
141 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
149 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
142 | | | summary: Added h |
|
150 | | | summary: Added h | |
143 | | | |
|
151 | | | | |
144 | | o changeset: 6:87d6d6676308 |
|
152 | | o changeset: 6:87d6d6676308 | |
145 | | | bookmark: bar |
|
153 | | | bookmark: bar | |
146 | | | remote bookmark: $TESTTMP/server2/bar |
|
154 | | | remote bookmark: $TESTTMP/server2/bar | |
147 | | | remote bookmark: default/bar |
|
155 | | | remote bookmark: default/bar | |
148 | | | hoisted name: bar |
|
156 | | | hoisted name: bar | |
149 | | | user: test |
|
157 | | | user: test | |
150 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
158 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
151 | | | summary: Added g |
|
159 | | | summary: Added g | |
152 | | | |
|
160 | | | | |
153 | | o changeset: 5:825660c69f0c |
|
161 | | o changeset: 5:825660c69f0c | |
154 | |/ user: test |
|
162 | |/ user: test | |
155 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
163 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
156 | | summary: Added f |
|
164 | | summary: Added f | |
157 | | |
|
165 | | | |
158 | o changeset: 4:aa98ab95a928 |
|
166 | o changeset: 4:aa98ab95a928 | |
159 | | user: test |
|
167 | | user: test | |
160 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
168 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
161 | | summary: Added e |
|
169 | | summary: Added e | |
162 | | |
|
170 | | | |
163 | o changeset: 3:62615734edd5 |
|
171 | o changeset: 3:62615734edd5 | |
164 | | bookmark: foo |
|
172 | | bookmark: foo | |
165 | | remote bookmark: $TESTTMP/server2/foo |
|
173 | | remote bookmark: $TESTTMP/server2/foo | |
166 | | remote bookmark: default/foo |
|
174 | | remote bookmark: default/foo | |
167 | | hoisted name: foo |
|
175 | | hoisted name: foo | |
168 | | user: test |
|
176 | | user: test | |
169 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
177 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
170 | | summary: Added d |
|
178 | | summary: Added d | |
171 | | |
|
179 | | | |
172 | o changeset: 2:28ad74487de9 |
|
180 | o changeset: 2:28ad74487de9 | |
173 | | user: test |
|
181 | | user: test | |
174 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
182 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
175 | | summary: Added c |
|
183 | | summary: Added c | |
176 | | |
|
184 | | | |
177 | o changeset: 1:29becc82797a |
|
185 | o changeset: 1:29becc82797a | |
178 | | user: test |
|
186 | | user: test | |
179 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
187 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
180 | | summary: Added b |
|
188 | | summary: Added b | |
181 | | |
|
189 | | | |
182 | o changeset: 0:18d04c59bb5d |
|
190 | o changeset: 0:18d04c59bb5d | |
183 | user: test |
|
191 | user: test | |
184 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
192 | date: Thu Jan 01 00:00:00 1970 +0000 | |
185 | summary: Added a |
|
193 | summary: Added a | |
186 |
|
194 | |||
187 | Testing the templates provided by remotenames extension |
|
195 | Testing the templates provided by remotenames extension | |
188 |
|
196 | |||
189 | `remotenames` keyword |
|
197 | `remotenames` keyword | |
190 |
|
198 | |||
191 | $ hg log -G -T "{rev}:{node|short} {remotenames}\n" |
|
199 | $ hg log -G -T "{rev}:{node|short} {remotenames}\n" | |
192 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
200 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat | |
193 | | |
|
201 | | | |
194 | | o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
202 | | o 7:ec2426147f0e $TESTTMP/server2/default default/default | |
195 | | | |
|
203 | | | | |
196 | | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
204 | | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar | |
197 | | | |
|
205 | | | | |
198 | | o 5:825660c69f0c |
|
206 | | o 5:825660c69f0c | |
199 | |/ |
|
207 | |/ | |
200 | o 4:aa98ab95a928 |
|
208 | o 4:aa98ab95a928 | |
201 | | |
|
209 | | | |
202 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
210 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo | |
203 | | |
|
211 | | | |
204 | o 2:28ad74487de9 |
|
212 | o 2:28ad74487de9 | |
205 | | |
|
213 | | | |
206 | o 1:29becc82797a |
|
214 | o 1:29becc82797a | |
207 | | |
|
215 | | | |
208 | o 0:18d04c59bb5d |
|
216 | o 0:18d04c59bb5d | |
209 |
|
217 | |||
210 | `remotebookmarks` and `remotebranches` keywords |
|
218 | `remotebookmarks` and `remotebranches` keywords | |
211 |
|
219 | |||
212 | $ hg log -G -T "{rev}:{node|short} [{remotebookmarks}] ({remotebranches})" |
|
220 | $ hg log -G -T "{rev}:{node|short} [{remotebookmarks}] ({remotebranches})" | |
213 | @ 8:3e1487808078 [] ($TESTTMP/server2/wat default/wat) |
|
221 | @ 8:3e1487808078 [] ($TESTTMP/server2/wat default/wat) | |
214 | | |
|
222 | | | |
215 | | o 7:ec2426147f0e [] ($TESTTMP/server2/default default/default) |
|
223 | | o 7:ec2426147f0e [] ($TESTTMP/server2/default default/default) | |
216 | | | |
|
224 | | | | |
217 | | o 6:87d6d6676308 [$TESTTMP/server2/bar default/bar] () |
|
225 | | o 6:87d6d6676308 [$TESTTMP/server2/bar default/bar] () | |
218 | | | |
|
226 | | | | |
219 | | o 5:825660c69f0c [] () |
|
227 | | o 5:825660c69f0c [] () | |
220 | |/ |
|
228 | |/ | |
221 | o 4:aa98ab95a928 [] () |
|
229 | o 4:aa98ab95a928 [] () | |
222 | | |
|
230 | | | |
223 | o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] () |
|
231 | o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] () | |
224 | | |
|
232 | | | |
225 | o 2:28ad74487de9 [] () |
|
233 | o 2:28ad74487de9 [] () | |
226 | | |
|
234 | | | |
227 | o 1:29becc82797a [] () |
|
235 | o 1:29becc82797a [] () | |
228 | | |
|
236 | | | |
229 | o 0:18d04c59bb5d [] () |
|
237 | o 0:18d04c59bb5d [] () | |
230 |
|
238 | |||
231 | The `hoistednames` template keyword |
|
239 | The `hoistednames` template keyword | |
232 |
|
240 | |||
233 | $ hg log -GT "{rev}:{node|short} ({hoistednames})" |
|
241 | $ hg log -GT "{rev}:{node|short} ({hoistednames})" | |
234 | @ 8:3e1487808078 () |
|
242 | @ 8:3e1487808078 () | |
235 | | |
|
243 | | | |
236 | | o 7:ec2426147f0e () |
|
244 | | o 7:ec2426147f0e () | |
237 | | | |
|
245 | | | | |
238 | | o 6:87d6d6676308 (bar) |
|
246 | | o 6:87d6d6676308 (bar) | |
239 | | | |
|
247 | | | | |
240 | | o 5:825660c69f0c () |
|
248 | | o 5:825660c69f0c () | |
241 | |/ |
|
249 | |/ | |
242 | o 4:aa98ab95a928 () |
|
250 | o 4:aa98ab95a928 () | |
243 | | |
|
251 | | | |
244 | o 3:62615734edd5 (foo) |
|
252 | o 3:62615734edd5 (foo) | |
245 | | |
|
253 | | | |
246 | o 2:28ad74487de9 () |
|
254 | o 2:28ad74487de9 () | |
247 | | |
|
255 | | | |
248 | o 1:29becc82797a () |
|
256 | o 1:29becc82797a () | |
249 | | |
|
257 | | | |
250 | o 0:18d04c59bb5d () |
|
258 | o 0:18d04c59bb5d () | |
251 |
|
259 | |||
252 |
|
260 | |||
253 | Testing the revsets provided by remotenames extension |
|
261 | Testing the revsets provided by remotenames extension | |
254 |
|
262 | |||
255 | `remotenames` revset |
|
263 | `remotenames` revset | |
256 |
|
264 | |||
257 | $ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n" |
|
265 | $ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n" | |
258 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
266 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat | |
259 | : |
|
267 | : | |
260 | : o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
268 | : o 7:ec2426147f0e $TESTTMP/server2/default default/default | |
261 | : | |
|
269 | : | | |
262 | : o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
270 | : o 6:87d6d6676308 $TESTTMP/server2/bar default/bar | |
263 | :/ |
|
271 | :/ | |
264 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
272 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo | |
265 | | |
|
273 | | | |
266 | ~ |
|
274 | ~ | |
267 |
|
275 | |||
268 | `remotebranches` revset |
|
276 | `remotebranches` revset | |
269 |
|
277 | |||
270 | $ hg log -r "remotebranches()" -GT "{rev}:{node|short} {remotenames}\n" |
|
278 | $ hg log -r "remotebranches()" -GT "{rev}:{node|short} {remotenames}\n" | |
271 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
279 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat | |
272 | | |
|
280 | | | |
273 | ~ |
|
281 | ~ | |
274 | o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
282 | o 7:ec2426147f0e $TESTTMP/server2/default default/default | |
275 | | |
|
283 | | | |
276 | ~ |
|
284 | ~ | |
277 |
|
285 | |||
278 | `remotebookmarks` revset |
|
286 | `remotebookmarks` revset | |
279 |
|
287 | |||
280 | $ hg log -r "remotebookmarks()" -GT "{rev}:{node|short} {remotenames}\n" |
|
288 | $ hg log -r "remotebookmarks()" -GT "{rev}:{node|short} {remotenames}\n" | |
281 | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
289 | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar | |
282 | : |
|
290 | : | |
283 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
291 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo | |
284 | | |
|
292 | | | |
285 | ~ |
|
293 | ~ | |
286 |
|
294 | |||
287 | Updating to revision using hoisted name |
|
295 | Updating to revision using hoisted name | |
288 |
|
296 | |||
289 | Deleting local bookmark to make sure we update to hoisted name only |
|
297 | Deleting local bookmark to make sure we update to hoisted name only | |
290 |
|
298 | |||
291 | $ hg bookmark -d bar |
|
299 | $ hg bookmark -d bar | |
292 |
|
300 | |||
293 | $ hg up bar |
|
301 | $ hg up bar | |
294 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
302 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
295 |
|
303 | |||
296 | $ hg log -r . |
|
304 | $ hg log -r . | |
297 | changeset: 6:87d6d6676308 |
|
305 | changeset: 6:87d6d6676308 | |
298 | remote bookmark: $TESTTMP/server2/bar |
|
306 | remote bookmark: $TESTTMP/server2/bar | |
299 | remote bookmark: default/bar |
|
307 | remote bookmark: default/bar | |
300 | hoisted name: bar |
|
308 | hoisted name: bar | |
301 | user: test |
|
309 | user: test | |
302 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
310 | date: Thu Jan 01 00:00:00 1970 +0000 | |
303 | summary: Added g |
|
311 | summary: Added g | |
304 |
|
312 | |||
305 | When both local bookmark and hoisted name exists but on different revs |
|
313 | When both local bookmark and hoisted name exists but on different revs | |
306 |
|
314 | |||
307 | $ hg up 8 |
|
315 | $ hg up 8 | |
308 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
316 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
309 |
|
317 | |||
310 | $ hg bookmark foo |
|
318 | $ hg bookmark foo | |
311 | moving bookmark 'foo' forward from 62615734edd5 |
|
319 | moving bookmark 'foo' forward from 62615734edd5 | |
312 |
|
320 | |||
313 | Local bookmark should take precedence over hoisted name |
|
321 | Local bookmark should take precedence over hoisted name | |
314 |
|
322 | |||
315 | $ hg up foo |
|
323 | $ hg up foo | |
316 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
324 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
317 |
|
325 | |||
318 | $ hg log -r . |
|
326 | $ hg log -r . | |
319 | changeset: 8:3e1487808078 |
|
327 | changeset: 8:3e1487808078 | |
320 | branch: wat |
|
328 | branch: wat | |
321 | bookmark: foo |
|
329 | bookmark: foo | |
322 | tag: tip |
|
330 | tag: tip | |
323 | remote branch: $TESTTMP/server2/wat |
|
331 | remote branch: $TESTTMP/server2/wat | |
324 | remote branch: default/wat |
|
332 | remote branch: default/wat | |
325 | parent: 4:aa98ab95a928 |
|
333 | parent: 4:aa98ab95a928 | |
326 | user: test |
|
334 | user: test | |
327 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
335 | date: Thu Jan 01 00:00:00 1970 +0000 | |
328 | summary: added bar |
|
336 | summary: added bar | |
329 |
|
337 | |||
330 | $ hg bookmarks |
|
338 | $ hg bookmarks | |
331 | $TESTTMP/server2/bar 6:87d6d6676308 |
|
339 | $TESTTMP/server2/bar 6:87d6d6676308 | |
332 | $TESTTMP/server2/foo 3:62615734edd5 |
|
340 | $TESTTMP/server2/foo 3:62615734edd5 | |
333 | default/bar 6:87d6d6676308 |
|
341 | default/bar 6:87d6d6676308 | |
334 | default/foo 3:62615734edd5 |
|
342 | default/foo 3:62615734edd5 | |
335 | * foo 8:3e1487808078 |
|
343 | * foo 8:3e1487808078 |
General Comments 0
You need to be logged in to leave comments.
Login now