Show More
@@ -387,8 +387,8 b' def overridemanifestmerge(origfn, repo, ' | |||
|
387 | 387 | # the second parent |
|
388 | 388 | lfile = splitstandin |
|
389 | 389 | standin = f |
|
390 |
msg = _('%s |
|
|
391 |
'use (l)argefile or keep |
|
|
390 | msg = _('remote turned local normal file %s into a largefile\n' | |
|
391 | 'use (l)argefile or keep (n)ormal file?' | |
|
392 | 392 | '$$ &Largefile $$ &Normal file') % lfile |
|
393 | 393 | if repo.ui.promptchoice(msg, 0) == 0: |
|
394 | 394 | processed.append((lfile, "r", None, msg)) |
@@ -401,8 +401,8 b' def overridemanifestmerge(origfn, repo, ' | |||
|
401 | 401 | # the second parent |
|
402 | 402 | standin = lfutil.standin(f) |
|
403 | 403 | lfile = f |
|
404 |
msg = _('%s |
|
|
405 |
'keep |
|
|
404 | msg = _('remote turned local largefile %s into a normal file\n' | |
|
405 | 'keep (l)argefile or use (n)ormal file?' | |
|
406 | 406 | '$$ &Largefile $$ &Normal file') % lfile |
|
407 | 407 | if repo.ui.promptchoice(msg, 0) == 0: |
|
408 | 408 | processed.append((lfile, "r", None, msg)) |
@@ -28,8 +28,8 b' Create the repository outside $HOME sinc' | |||
|
28 | 28 | Normal file in the working copy, keeping the normal version: |
|
29 | 29 | |
|
30 | 30 | $ echo "n" | hg merge --config ui.interactive=Yes |
|
31 |
|
|
|
32 |
use (l)argefile or keep |
|
|
31 | remote turned local normal file foo into a largefile | |
|
32 | use (l)argefile or keep (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
33 | 33 | (branch merge, don't forget to commit) |
|
34 | 34 | getting changed largefiles |
|
35 | 35 | 0 largefiles updated, 0 removed |
@@ -42,8 +42,8 b' Normal file in the working copy, keeping' | |||
|
42 | 42 | |
|
43 | 43 | $ hg update -q -C |
|
44 | 44 | $ echo "l" | hg merge --config ui.interactive=Yes |
|
45 |
|
|
|
46 |
use (l)argefile or keep |
|
|
45 | remote turned local normal file foo into a largefile | |
|
46 | use (l)argefile or keep (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
47 | 47 | (branch merge, don't forget to commit) |
|
48 | 48 | getting changed largefiles |
|
49 | 49 | 1 largefiles updated, 0 removed |
@@ -70,8 +70,8 b' Largefile in the working copy, keeping t' | |||
|
70 | 70 | |
|
71 | 71 | $ hg update -q -C -r 1 |
|
72 | 72 | $ echo "n" | hg merge --config ui.interactive=Yes |
|
73 |
|
|
|
74 |
keep |
|
|
73 | remote turned local largefile foo into a normal file | |
|
74 | keep (l)argefile or use (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
75 | 75 | (branch merge, don't forget to commit) |
|
76 | 76 | getting changed largefiles |
|
77 | 77 | 0 largefiles updated, 0 removed |
@@ -98,8 +98,8 b' Largefile in the working copy, keeping t' | |||
|
98 | 98 | |
|
99 | 99 | $ hg update -q -C -r 1 |
|
100 | 100 | $ echo "l" | hg merge --config ui.interactive=Yes |
|
101 |
|
|
|
102 |
keep |
|
|
101 | remote turned local largefile foo into a normal file | |
|
102 | keep (l)argefile or use (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
103 | 103 | (branch merge, don't forget to commit) |
|
104 | 104 | getting changed largefiles |
|
105 | 105 | 1 largefiles updated, 0 removed |
@@ -219,8 +219,8 b' Ancestor: normal Parent: normal2 Paren' | |||
|
219 | 219 | $ hg merge -r large |
|
220 | 220 | local changed f which remote deleted |
|
221 | 221 | use (c)hanged version or (d)elete? c |
|
222 |
|
|
|
223 |
use (l)argefile or keep |
|
|
222 | remote turned local normal file f into a largefile | |
|
223 | use (l)argefile or keep (n)ormal file? l | |
|
224 | 224 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
225 | 225 | (branch merge, don't forget to commit) |
|
226 | 226 | getting changed largefiles |
@@ -231,8 +231,8 b' Ancestor: normal Parent: normal2 Paren' | |||
|
231 | 231 | $ hg up -Cqr normal2 |
|
232 | 232 | $ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes |
|
233 | 233 | local changed f which remote deleted |
|
234 |
use (c)hanged version or (d)elete? |
|
|
235 |
use (l)argefile or keep |
|
|
234 | use (c)hanged version or (d)elete? remote turned local normal file f into a largefile | |
|
235 | use (l)argefile or keep (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
236 | 236 | (branch merge, don't forget to commit) |
|
237 | 237 | getting changed largefiles |
|
238 | 238 | 0 largefiles updated, 0 removed |
@@ -255,8 +255,8 b' swap' | |||
|
255 | 255 | $ hg merge -r normal2 |
|
256 | 256 | remote changed f which local deleted |
|
257 | 257 | use (c)hanged version or leave (d)eleted? c |
|
258 |
|
|
|
259 |
keep |
|
|
258 | remote turned local largefile f into a normal file | |
|
259 | keep (l)argefile or use (n)ormal file? l | |
|
260 | 260 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
261 | 261 | (branch merge, don't forget to commit) |
|
262 | 262 | getting changed largefiles |
@@ -267,8 +267,8 b' swap' | |||
|
267 | 267 | $ hg up -Cqr large |
|
268 | 268 | $ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes |
|
269 | 269 | remote changed f which local deleted |
|
270 |
use (c)hanged version or leave (d)eleted? |
|
|
271 |
keep |
|
|
270 | use (c)hanged version or leave (d)eleted? remote turned local largefile f into a normal file | |
|
271 | keep (l)argefile or use (n)ormal file? 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
272 | 272 | (branch merge, don't forget to commit) |
|
273 | 273 | getting changed largefiles |
|
274 | 274 | 0 largefiles updated, 0 removed |
@@ -312,8 +312,8 b' Ancestor: large Parent: large2 Paren' | |||
|
312 | 312 | $ hg merge -r normal |
|
313 | 313 | local changed .hglf/f which remote deleted |
|
314 | 314 | use (c)hanged version or (d)elete? c |
|
315 |
|
|
|
316 |
keep |
|
|
315 | remote turned local largefile f into a normal file | |
|
316 | keep (l)argefile or use (n)ormal file? l | |
|
317 | 317 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
318 | 318 | (branch merge, don't forget to commit) |
|
319 | 319 | getting changed largefiles |
@@ -337,8 +337,8 b' swap' | |||
|
337 | 337 | $ hg merge -r large2 |
|
338 | 338 | remote changed .hglf/f which local deleted |
|
339 | 339 | use (c)hanged version or leave (d)eleted? c |
|
340 |
|
|
|
341 |
use (l)argefile or keep |
|
|
340 | remote turned local normal file f into a largefile | |
|
341 | use (l)argefile or keep (n)ormal file? l | |
|
342 | 342 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
343 | 343 | (branch merge, don't forget to commit) |
|
344 | 344 | getting changed largefiles |
General Comments 0
You need to be logged in to leave comments.
Login now