equal
deleted
inserted
replaced
138 $ cat large1 |
138 $ cat large1 |
139 large1 in #1 |
139 large1 in #1 |
140 $ cat .hglf/large1 |
140 $ cat .hglf/large1 |
141 58e24f733a964da346e2407a2bee99d9001184f5 |
141 58e24f733a964da346e2407a2bee99d9001184f5 |
142 |
142 |
|
143 (merge non-existing largefiles from "other" via conflict prompt - |
|
144 make sure the following commit doesn't abort in a confusing way when trying to |
|
145 mark the non-existing file as normal in lfdirstate) |
|
146 |
|
147 $ mv .hg/largefiles/58e24f733a964da346e2407a2bee99d9001184f5 . |
|
148 $ hg update -q -C 3 |
|
149 $ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF |
|
150 > o |
|
151 > EOF |
|
152 largefile large1 has a merge conflict |
|
153 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
154 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
|
155 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
|
156 getting changed largefiles |
|
157 large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) |
|
158 0 largefiles updated, 0 removed |
|
159 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
160 (branch merge, don't forget to commit) |
|
161 $ hg commit -m '1-2-3 testing' |
|
162 $ hg rollback -q |
|
163 $ mv 58e24f733a964da346e2407a2bee99d9001184f5 .hg/largefiles/ |
|
164 |
143 Test that "hg revert -r REV" updates largefiles from "REV" correctly |
165 Test that "hg revert -r REV" updates largefiles from "REV" correctly |
144 |
166 |
145 $ hg update -q -C 3 |
167 $ hg update -q -C 3 |
146 $ hg status -A large1 |
168 $ hg status -A large1 |
147 C large1 |
169 C large1 |