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