##// END OF EJS Templates
update: show the commit to which we updated in case of multiple heads (BC)...
Pulkit Goyal -
r32698:1b5c61d3 default
parent child Browse files
Show More
@@ -391,6 +391,9 b' def _statusotherbranchheads(ui, repo):'
391 ui.warn(_('(committing will reopen branch "%s")\n') %
391 ui.warn(_('(committing will reopen branch "%s")\n') %
392 (currentbranch))
392 (currentbranch))
393 elif otherheads:
393 elif otherheads:
394 curhead = repo['.']
395 ui.status(_('updated to "%s: %s"\n') % (curhead,
396 curhead.description().split('\n')[0]))
394 ui.status(_('%i other heads for branch "%s"\n') %
397 ui.status(_('%i other heads for branch "%s"\n') %
395 (len(otherheads), currentbranch))
398 (len(otherheads), currentbranch))
396
399
@@ -244,6 +244,7 b' hg up -C'
244
244
245 $ hg up -C
245 $ hg up -C
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 updated to "d42e18c7bc9b: 18"
247 3 other heads for branch "default"
248 3 other heads for branch "default"
248
249
249 complex bisect test 1 # first bad rev is 9
250 complex bisect test 1 # first bad rev is 9
@@ -137,6 +137,7 b' extension and python hooks - use the eol'
137 $ hg update
137 $ hg update
138 hooked
138 hooked
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
140 updated to "d02f48003e62: c"
140 1 other heads for branch "default"
141 1 other heads for branch "default"
141 $ hg blackbox -l 6
142 $ hg blackbox -l 6
142 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update
143 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update
@@ -220,6 +220,7 b' are merging, unlike :local and :other'
220
220
221 $ hg up -C
221 $ hg up -C
222 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
222 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
223 updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????"
223 1 other heads for branch "default"
224 1 other heads for branch "default"
224 $ printf "\n\nEnd of file\n" >> a
225 $ printf "\n\nEnd of file\n" >> a
225 $ hg ci -m "Add some stuff at the end"
226 $ hg ci -m "Add some stuff at the end"
@@ -258,6 +259,7 b' Now test :merge-other and :merge-local'
258
259
259 $ hg up -C
260 $ hg up -C
260 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
261 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
262 updated to "18b51d585961: Add some stuff at the beginning"
261 1 other heads for branch "default"
263 1 other heads for branch "default"
262 $ hg merge --tool :merge-local
264 $ hg merge --tool :merge-local
263 merging a
265 merging a
@@ -206,6 +206,7 b' Inject corruption into the largefiles st'
206 large: data corruption in $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 with hash 6a7bb2556144babe3899b25e5428123735bb1e27 (glob)
206 large: data corruption in $TESTTMP/src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 with hash 6a7bb2556144babe3899b25e5428123735bb1e27 (glob)
207 0 largefiles updated, 0 removed
207 0 largefiles updated, 0 removed
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
209 updated to "cd24c147f45c: modified"
209 [12] other heads for branch "default" (re)
210 [12] other heads for branch "default" (re)
210 $ hg st
211 $ hg st
211 ! large
212 ! large
@@ -71,6 +71,7 b" we don't have to hash them again next ti"
71
71
72 $ hg up
72 $ hg up
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
74 updated to "f74e50bd9e55: #2"
74 1 other heads for branch "default"
75 1 other heads for branch "default"
75 $ hg debugdirstate --large --nodate
76 $ hg debugdirstate --large --nodate
76 n 644 7 set large1
77 n 644 7 set large1
@@ -86,6 +87,7 b' prevents unnecessary hashing of content '
86 n 644 13 set large2
87 n 644 13 set large2
87 $ hg up
88 $ hg up
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 updated to "f74e50bd9e55: #2"
89 1 other heads for branch "default"
91 1 other heads for branch "default"
90 $ hg debugdirstate --large --nodate
92 $ hg debugdirstate --large --nodate
91 n 644 7 set large1
93 n 644 7 set large1
@@ -471,6 +473,7 b' Test that the internal linear merging wo'
471 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
473 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
472 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
474 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
473 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
475 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
476 updated to "d65e59e952a9: #5"
474 1 other heads for branch "default"
477 1 other heads for branch "default"
475
478
476 $ hg status -A large1
479 $ hg status -A large1
@@ -505,6 +508,7 b' Test that the internal linear merging wo'
505 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
508 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
506 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
509 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
507 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
510 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
511 updated to "d65e59e952a9: #5"
508 1 other heads for branch "default"
512 1 other heads for branch "default"
509
513
510 $ hg status -A large1
514 $ hg status -A large1
@@ -114,6 +114,7 b' Interactive merge:'
114
114
115 $ hg co -C
115 $ hg co -C
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
117 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
117 1 other heads for branch "default"
118 1 other heads for branch "default"
118
119
119 $ hg merge --config ui.interactive=true <<EOF
120 $ hg merge --config ui.interactive=true <<EOF
@@ -178,6 +179,7 b' Interactive merge with bad input:'
178
179
179 $ hg co -C
180 $ hg co -C
180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
182 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
181 1 other heads for branch "default"
183 1 other heads for branch "default"
182
184
183 $ hg merge --config ui.interactive=true <<EOF
185 $ hg merge --config ui.interactive=true <<EOF
@@ -254,6 +256,7 b' Interactive merge with not enough input:'
254
256
255 $ hg co -C
257 $ hg co -C
256 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
258 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
259 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
257 1 other heads for branch "default"
260 1 other heads for branch "default"
258
261
259 $ hg merge --config ui.interactive=true <<EOF
262 $ hg merge --config ui.interactive=true <<EOF
@@ -316,6 +319,7 b' Choose local versions of files'
316
319
317 $ hg co -C
320 $ hg co -C
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
321 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
322 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
319 1 other heads for branch "default"
323 1 other heads for branch "default"
320
324
321 $ hg merge --tool :local
325 $ hg merge --tool :local
@@ -364,6 +368,7 b' Choose other versions of files'
364
368
365 $ hg co -C
369 $ hg co -C
366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
370 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
371 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
367 1 other heads for branch "default"
372 1 other heads for branch "default"
368
373
369 $ hg merge --tool :other
374 $ hg merge --tool :other
@@ -412,6 +417,7 b' Fail'
412
417
413 $ hg co -C
418 $ hg co -C
414 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
419 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
420 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
415 1 other heads for branch "default"
421 1 other heads for branch "default"
416
422
417 $ hg merge --tool :fail
423 $ hg merge --tool :fail
@@ -463,6 +469,7 b' Force prompts with no input (should be s'
463
469
464 $ hg co -C
470 $ hg co -C
465 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
471 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
472 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
466 1 other heads for branch "default"
473 1 other heads for branch "default"
467
474
468 $ hg merge --config ui.interactive=True --tool :prompt
475 $ hg merge --config ui.interactive=True --tool :prompt
@@ -521,6 +528,7 b' Force prompts'
521
528
522 $ hg co -C
529 $ hg co -C
523 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
530 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
531 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
524 1 other heads for branch "default"
532 1 other heads for branch "default"
525
533
526 $ hg merge --tool :prompt
534 $ hg merge --tool :prompt
@@ -577,6 +585,7 b' Choose to merge all files'
577
585
578 $ hg co -C
586 $ hg co -C
579 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
587 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
588 updated to "13910f48cf7b: changed file1, removed file2, changed file3"
580 1 other heads for branch "default"
589 1 other heads for branch "default"
581
590
582 $ hg merge --tool :merge3
591 $ hg merge --tool :merge3
@@ -33,6 +33,7 b' Should fail because not at a head:'
33
33
34 $ hg up
34 $ hg up
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 updated to "f25cbe84d8b3: e"
36 2 other heads for branch "default"
37 2 other heads for branch "default"
37
38
38 Should fail because > 2 heads:
39 Should fail because > 2 heads:
@@ -155,6 +155,7 b' Update to link without local change shou'
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
156 $ hg up
156 $ hg up
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
158 updated to "521a1e40188f: symlink"
158 1 other heads for branch "default"
159 1 other heads for branch "default"
159 $ hg st
160 $ hg st
160 ? a.orig
161 ? a.orig
@@ -176,6 +177,7 b' Update to link with local change should '
176 keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u
177 keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u
177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
178 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
178 use 'hg resolve' to retry unresolved file merges
179 use 'hg resolve' to retry unresolved file merges
180 updated to "521a1e40188f: symlink"
179 1 other heads for branch "default"
181 1 other heads for branch "default"
180 [1]
182 [1]
181 $ hg diff --git
183 $ hg diff --git
@@ -133,6 +133,7 b' Should succeed because there is only one'
133 adding file changes
133 adding file changes
134 added 4 changesets with 4 changes to 1 files (+1 heads)
134 added 4 changesets with 4 changes to 1 files (+1 heads)
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
136 updated to "d740e1a584e7: a5.2"
136 1 other heads for branch "branchA"
137 1 other heads for branch "branchA"
137
138
138 Make changes on new branch on tt
139 Make changes on new branch on tt
@@ -41,6 +41,7 b' Should not update to the other topologic'
41 adding file changes
41 adding file changes
42 added 1 changesets with 1 changes to 1 files (+1 heads)
42 added 1 changesets with 1 changes to 1 files (+1 heads)
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 updated to "800c91d5bfc1: m"
44 1 other heads for branch "default"
45 1 other heads for branch "default"
45
46
46 $ cd ../tt
47 $ cd ../tt
@@ -55,6 +56,7 b' Should not update to the other branch:'
55 adding file changes
56 adding file changes
56 added 1 changesets with 1 changes to 1 files (+1 heads)
57 added 1 changesets with 1 changes to 1 files (+1 heads)
57 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 updated to "107cefe13e42: m"
58 1 other heads for branch "default"
60 1 other heads for branch "default"
59
61
60 $ HGMERGE=true hg merge
62 $ HGMERGE=true hg merge
@@ -347,6 +347,7 b' pull --rebase update (no rebase) use pro'
347 added 1 changesets with 1 changes to 1 files (+1 heads)
347 added 1 changesets with 1 changes to 1 files (+1 heads)
348 nothing to rebase - updating instead
348 nothing to rebase - updating instead
349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
350 updated to "65bc164c1d9b: R6"
350 1 other heads for branch "default"
351 1 other heads for branch "default"
351 $ hg tglog
352 $ hg tglog
352 @ 9: 'R6'
353 @ 9: 'R6'
@@ -287,6 +287,7 b' after strip of merge parent'
287
287
288 $ hg up
288 $ hg up
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
290 updated to "264128213d29: c"
290 1 other heads for branch "default"
291 1 other heads for branch "default"
291 $ hg log -G
292 $ hg log -G
292 @ changeset: 4:264128213d29
293 @ changeset: 4:264128213d29
@@ -680,6 +680,7 b' update'
680 $ cd ../t
680 $ cd ../t
681 $ hg up -C # discard our earlier merge
681 $ hg up -C # discard our earlier merge
682 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
682 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
683 updated to "c373c8102e68: 12"
683 2 other heads for branch "default"
684 2 other heads for branch "default"
684 $ echo blah > t/t
685 $ echo blah > t/t
685 $ hg ci -m13
686 $ hg ci -m13
@@ -694,6 +695,7 b' KeyError'
694
695
695 $ hg up -C # discard changes
696 $ hg up -C # discard changes
696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
697 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
698 updated to "925c17564ef8: 13"
697 2 other heads for branch "default"
699 2 other heads for branch "default"
698
700
699 pull
701 pull
@@ -736,6 +738,7 b' should pull t'
736 adding file changes
738 adding file changes
737 added 1 changesets with 1 changes to 1 files
739 added 1 changesets with 1 changes to 1 files
738 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
740 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
741 updated to "925c17564ef8: 13"
739 2 other heads for branch "default"
742 2 other heads for branch "default"
740 $ cat t/t
743 $ cat t/t
741 blah
744 blah
@@ -1212,6 +1215,7 b' Check hg update --clean'
1212 ? s/c
1215 ? s/c
1213 $ hg update -C
1216 $ hg update -C
1214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1217 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1218 updated to "925c17564ef8: 13"
1215 2 other heads for branch "default"
1219 2 other heads for branch "default"
1216 $ hg status -S
1220 $ hg status -S
1217 ? s/b
1221 ? s/b
@@ -419,6 +419,7 b" transplant -c shouldn't use an old chang"
419
419
420 $ hg up -C
420 $ hg up -C
421 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
421 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
422 updated to "e8643552fde5: foobar"
422 1 other heads for branch "default"
423 1 other heads for branch "default"
423 $ rm added
424 $ rm added
424 $ hg transplant --continue
425 $ hg transplant --continue
@@ -172,6 +172,7 b' create a second head'
172
172
173 $ hg --debug up
173 $ hg --debug up
174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
175 updated to "1e71731e6fbb: 2"
175 1 other heads for branch "default"
176 1 other heads for branch "default"
176
177
177 test conflicting untracked files
178 test conflicting untracked files
@@ -94,6 +94,7 b' Cases are run as shown in that table, ro'
94
94
95 $ norevtest 'none clean same' clean 2
95 $ norevtest 'none clean same' clean 2
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
97 updated to "bd10386d478c: 2"
97 1 other heads for branch "default"
98 1 other heads for branch "default"
98 parent=2
99 parent=2
99
100
@@ -141,6 +142,7 b' Cases are run as shown in that table, ro'
141
142
142 $ norevtest 'none dirty cross' dirty 2
143 $ norevtest 'none dirty cross' dirty 2
143 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
144 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
145 updated to "bd10386d478c: 2"
144 1 other heads for branch "default"
146 1 other heads for branch "default"
145 parent=2
147 parent=2
146 M foo
148 M foo
@@ -177,6 +179,7 b' Cases are run as shown in that table, ro'
177
179
178 $ norevtest '-c clean same' clean 2 -c
180 $ norevtest '-c clean same' clean 2 -c
179 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
182 updated to "bd10386d478c: 2"
180 1 other heads for branch "default"
183 1 other heads for branch "default"
181 parent=2
184 parent=2
182
185
General Comments 0
You need to be logged in to leave comments. Login now