Mercurial > public > mercurial-scm > hg
diff tests/test-largefiles-update.t @ 42587:421fdf30c37c
largefiles: make last line of prompts <40 english chars (issue6158)
Differential Revision: https://phab.mercurial-scm.org/D6571
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Mon, 24 Jun 2019 16:00:39 -0700 |
| parents | 4764e8436b2a |
| children | f6540aba8e3e |
line wrap: on
line diff
--- a/tests/test-largefiles-update.t Sun Jun 30 18:32:43 2019 +0900 +++ b/tests/test-largefiles-update.t Mon Jun 24 16:00:39 2019 -0700 @@ -133,8 +133,8 @@ > EOF largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or - take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o + you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. + what do you want to do? o merging normal1 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') getting changed largefiles @@ -161,8 +161,8 @@ > EOF largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or - take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o + you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. + what do you want to do? o getting changed largefiles large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) 0 largefiles updated, 0 removed @@ -361,8 +361,8 @@ > EOF largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or - take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o + you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. + what do you want to do? o getting changed largefiles 1 largefiles updated, 0 removed 1 files updated, 1 files merged, 0 files removed, 0 files unresolved @@ -380,8 +380,8 @@ $ hg update 3 --config debug.dirstate.delaywrite=2 largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or - take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l + you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. + what do you want to do? l 1 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg status -A large1 M large1 @@ -461,8 +461,8 @@ keep (l)argefile or use (n)ormal file? l largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or - take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l + you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. + what do you want to do? l 2 files updated, 1 files merged, 0 files removed, 0 files unresolved updated to "d65e59e952a9: #5" 1 other heads for branch "default" @@ -497,8 +497,8 @@ keep (l)argefile or use (n)ormal file? l largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or - take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l + you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. + what do you want to do? l 2 files updated, 1 files merged, 0 files removed, 0 files unresolved updated to "d65e59e952a9: #5" 1 other heads for branch "default" @@ -552,8 +552,8 @@ keep (l)argefile or use (n)ormal file? l largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or - take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l + you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. + what do you want to do? l 2 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -587,8 +587,8 @@ rebasing 1:72518492caa6 "#1" largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 - keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or - take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o + you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5. + what do you want to do? o merging normal1 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)