48 58e24f733a964da346e2407a2bee99d9001184f5 |
48 58e24f733a964da346e2407a2bee99d9001184f5 |
49 $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
49 $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
50 -4669e532d5b2c093a78eca010077e708a071bb64 |
50 -4669e532d5b2c093a78eca010077e708a071bb64 |
51 +58e24f733a964da346e2407a2bee99d9001184f5 |
51 +58e24f733a964da346e2407a2bee99d9001184f5 |
52 |
52 |
|
53 (getting largefiles from "other" via conflict prompt) |
|
54 |
|
55 $ hg update -q -C 2 |
|
56 $ echo 'large1 in #3' > large1 |
|
57 $ echo 'normal1 in #3' > normal1 |
|
58 $ hg commit -m '#3' |
|
59 $ cat .hglf/large1 |
|
60 e5bb990443d6a92aaf7223813720f7566c9dd05b |
|
61 $ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF |
|
62 > o |
|
63 > EOF |
|
64 largefile large1 has a merge conflict |
|
65 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
66 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
|
67 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? merging normal1 |
|
68 warning: conflicts during merge. |
|
69 merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
70 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
71 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
72 getting changed largefiles |
|
73 1 largefiles updated, 0 removed |
|
74 [1] |
|
75 $ hg status -A large1 |
|
76 M large1 |
|
77 $ cat large1 |
|
78 large1 in #1 |
|
79 $ cat .hglf/large1 |
|
80 58e24f733a964da346e2407a2bee99d9001184f5 |
|
81 |
53 $ cd .. |
82 $ cd .. |