Mercurial > hg

comparison tests/test-largefiles-update.t @ 22589:9ab18a912c44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: show prompt choice if input is not a tty but is forced to be interactive The tests often set ui.interactive to control normally interactive prompts from stdin. That gave an output where it was non-obvious what prompts got which which response, and the output lacked the newline users would see after input. Instead, if the input not is a tty, write the selection and a newline.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Oct 2014 01:04:18 +0200
parents e26df4e774f6
children d4c972b97fee
comparison
equal deleted inserted replaced
22588:cd1b43226b34 22589:9ab18a912c44
62 > o 62 > o
63 > EOF 63 > EOF
64 largefile large1 has a merge conflict 64 largefile large1 has a merge conflict
65 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 65 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
66 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or 66 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
67 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? merging normal1 67 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
68 merging normal1
68 warning: conflicts during merge. 69 warning: conflicts during merge.
69 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') 70 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
70 getting changed largefiles 71 getting changed largefiles
71 1 largefiles updated, 0 removed 72 1 largefiles updated, 0 removed
72 0 files updated, 1 files merged, 0 files removed, 1 files unresolved 73 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
247 > o 248 > o
248 > EOF 249 > EOF
249 largefile large1 has a merge conflict 250 largefile large1 has a merge conflict
250 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 251 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
251 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or 252 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
252 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? getting changed largefiles 253 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o
254 getting changed largefiles
253 1 largefiles updated, 0 removed 255 1 largefiles updated, 0 removed
254 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 256 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
255 $ hg status -A large1 257 $ hg status -A large1
256 C large1 258 C large1
257 $ cat large1 259 $ cat large1
430 > c 432 > c
431 > l 433 > l
432 > l 434 > l
433 > EOF 435 > EOF
434 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) 436 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
435 (M)erge, keep (l)ocal or keep (r)emote? subrepository sources for sub differ (in checked out version) 437 (M)erge, keep (l)ocal or keep (r)emote? m
438 subrepository sources for sub differ (in checked out version)
436 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? 439 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)?
437 local changed .hglf/large2 which remote deleted 440 r
438 use (c)hanged version or (d)elete? remote turned local largefile large2 into a normal file 441 local changed .hglf/large2 which remote deleted
439 keep (l)argefile or use (n)ormal file? largefile large1 has a merge conflict 442 use (c)hanged version or (d)elete? c
443 remote turned local largefile large2 into a normal file
444 keep (l)argefile or use (n)ormal file? l
445 largefile large1 has a merge conflict
440 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 446 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
441 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or 447 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
442 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? 2 files updated, 1 files merged, 0 files removed, 0 files unresolved 448 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
449 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
443 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 450 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
444 451
445 $ hg -R sub status -A sub/large1 452 $ hg -R sub status -A sub/large1
446 M sub/large1 453 M sub/large1
447 $ cat sub/large1 454 $ cat sub/large1
470 > o 477 > o
471 > EOF 478 > EOF
472 largefile large1 has a merge conflict 479 largefile large1 has a merge conflict
473 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 480 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
474 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or 481 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
475 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? merging normal1 482 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
483 merging normal1
476 warning: conflicts during merge. 484 warning: conflicts during merge.
477 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') 485 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
478 unresolved conflicts (see hg resolve, then hg rebase --continue) 486 unresolved conflicts (see hg resolve, then hg rebase --continue)
479 [1] 487 [1]
480 $ cat .hglf/large1 488 $ cat .hglf/large1