Mercurial > hg
diff tests/test-issue3084.t @ 23541:495bc1b65d25
merge: move cd/dc prompts after largefiles prompts
By moving the cd/dc prompts out of calculateupdates(), we let
largefiles' overridecalculateupdates() so the unresolved values
(i.e. 'cd' or 'dc' rather than 'g', 'r', 'a' and missing). This allows
overridecalculateupdates() to ask the user whether to keep the normal
file or the largefile before the user gets the cd/dc prompt. Whichever
answer the user gives, we make overridecalculateupdates() replace 'cd'
or 'dc' action, saving the user one annoying (and less clear)
question.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 11 Dec 2014 21:21:21 -0800 |
parents | 28f01c318c05 |
children | 9d5c27890790 |
line wrap: on
line diff
--- a/tests/test-issue3084.t Sun Nov 30 22:47:53 2014 -0500 +++ b/tests/test-issue3084.t Thu Dec 11 21:21:21 2014 -0800 @@ -283,8 +283,6 @@ $ hg up -Cqr normal2 $ hg merge -r large - local changed f which remote deleted - use (c)hanged version or (d)elete? c remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file? l getting changed largefiles @@ -295,9 +293,7 @@ large $ hg up -Cqr normal2 - $ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes - local changed f which remote deleted - use (c)hanged version or (d)elete? c + $ echo n | hg merge -r large --config ui.interactive=Yes remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file? n 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -305,23 +301,10 @@ $ cat f normal2 - $ hg up -Cqr normal2 - $ echo d | hg merge -r large --config ui.interactive=Yes - local changed f which remote deleted - use (c)hanged version or (d)elete? d - getting changed largefiles - 1 largefiles updated, 0 removed - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ cat f - large - swap $ hg up -Cqr large $ hg merge -r normal2 - remote changed f which local deleted - use (c)hanged version or leave (d)eleted? c remote turned local largefile f into a normal file keep (l)argefile or use (n)ormal file? l getting changed largefiles @@ -332,9 +315,7 @@ large $ hg up -Cqr large - $ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes - remote changed f which local deleted - use (c)hanged version or leave (d)eleted? c + $ echo n | hg merge -r normal2 --config ui.interactive=Yes remote turned local largefile f into a normal file keep (l)argefile or use (n)ormal file? n getting changed largefiles @@ -344,17 +325,6 @@ $ cat f normal2 - $ hg up -Cqr large - $ echo d | hg merge -r normal2 --config ui.interactive=Yes - remote changed f which local deleted - use (c)hanged version or leave (d)eleted? d - getting changed largefiles - 0 largefiles updated, 0 removed - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ cat f - large - Ancestor: large Parent: large-id Parent: normal result: normal $ hg up -Cqr large-id @@ -400,8 +370,6 @@ $ hg up -Cqr large2 $ hg merge -r normal - local changed .hglf/f which remote deleted - use (c)hanged version or (d)elete? c remote turned local largefile f into a normal file keep (l)argefile or use (n)ormal file? l getting changed largefiles @@ -412,9 +380,9 @@ large2 $ hg up -Cqr large2 - $ echo d | hg merge -r normal --config ui.interactive=Yes - local changed .hglf/f which remote deleted - use (c)hanged version or (d)elete? d + $ echo n | hg merge -r normal --config ui.interactive=Yes + remote turned local largefile f into a normal file + keep (l)argefile or use (n)ormal file? n getting changed largefiles 0 largefiles updated, 0 removed 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -426,8 +394,6 @@ $ hg up -Cqr normal $ hg merge -r large2 - remote changed .hglf/f which local deleted - use (c)hanged version or leave (d)eleted? c remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file? l getting changed largefiles @@ -438,9 +404,9 @@ large2 $ hg up -Cqr normal - $ echo d | hg merge -r large2 --config ui.interactive=Yes - remote changed .hglf/f which local deleted - use (c)hanged version or leave (d)eleted? d + $ echo n | hg merge -r large2 --config ui.interactive=Yes + remote turned local normal file f into a largefile + use (l)argefile or keep (n)ormal file? n 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cat f