Mercurial: comparison tests/test-largefiles-update.t

equal deleted inserted replaced

-:cad3dde7a573
+:421fdf30c37c
 $ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF
 > o
 > EOF
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
+you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
-take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+what do you want to do? o
 merging normal1
 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
 getting changed largefiles
 1 largefiles updated, 0 removed
 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
 $ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF
 > o
 > EOF
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
+you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
-take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+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
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ hg update 3 --config ui.interactive=True <<EOF
 > o
 > EOF
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
+you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
-take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o
+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
 $ hg status -A large1
 C large1
 $ hg update -q -C 2
 $ echo 'large1 for linear merge (conflict)' > large1
 $ hg update 3 --config debug.dirstate.delaywrite=2
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
+you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
-take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+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
 $ cat large1
 large1 for linear merge (conflict)
 new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
 remote turned local largefile large2 into a normal file
 keep (l)argefile or use (n)ormal file? l
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
+you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
-take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+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"
 $ hg status -A large1
 new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
 remote turned local largefile large2 into a normal file
 keep (l)argefile or use (n)ormal file? l
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
+you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
-take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+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"
 $ hg status -A large1
 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r
 remote turned local largefile large2 into a normal file
 keep (l)argefile or use (n)ormal file? l
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
+you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
-take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+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
 $ hg -R sub status -A sub/large1
 M sub/large1
 > o
 > EOF
 rebasing 1:72518492caa6 "#1"
 largefile large1 has a merge conflict
 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
-keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
+you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
-take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+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)
 [1]
 $ cat .hglf/large1

changeset 42587	421fdf30c37c
parent 42565	4764e8436b2a
child 42588	f6540aba8e3e