[Bug 4801] New: While merging, the "was merge successful?" prompts no longer appear
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Aug 28 16:35:19 UTC 2015
http://bz.selenic.com/show_bug.cgi?id=4801
Priority: normal
Bug ID: 4801
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: While merging, the "was merge successful?" prompts no
longer appear
Severity: bug
Classification: Unclassified
OS: Windows
Reporter: dee at earlsoft.co.uk
Hardware: PC
Status: UNCONFIRMED
Version: 3.5
Component: Mercurial
Product: Mercurial
When performing a merge, and not changing the local version, mercurial normally
prompts with "was merge successful (yn)?".
In hg 3.5+5 (in thg 3.5), the prompt is no longer visible, but it still waits
for an answer.
P:\iCatcher\Console\Development>hg merge 6.1
merging .hgtags
merging Changelog.txt
merging Console/Console.res
y
merging Console/Console.vbp
y
merging Console/Feeds/Settings/Settings.cls
merging Node/Node.vbp
y
merging Version.cs
y
merging VidCap/VidCap.vbp
y
10 files updated, 8 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
P:\iCatcher\Console\Development>
If I disable the progress bar, then the prompts appear as normal:
P:\iCatcher\Console\Development>hg merge 6.1
merging .hgtags
merging Changelog.txt
merging Console/Console.res
output file Console/Console.res appears unchanged
was merge successful (yn)? y
merging Console/Console.vbp
output file Console/Console.vbp appears unchanged
was merge successful (yn)? y
merging Console/Feeds/Settings/Settings.cls
merging Node/Node.vbp
output file Node/Node.vbp appears unchanged
was merge successful (yn)? y
merging Version.cs
output file Version.cs appears unchanged
was merge successful (yn)? y
merging VidCap/VidCap.vbp
output file VidCap/VidCap.vbp appears unchanged
was merge successful (yn)? y
10 files updated, 8 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
P:\iCatcher\Console\Development>
This is running hg 3.5+5, thg 3.5 on Windows 7, in the normal command prompt.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list