Skip to content
Snippets Groups Projects
  • Siddharth Agarwal's avatar
    ef1eb6df7071
    simplemerge: move conflict warning message to filemerge · ef1eb6df7071
    Siddharth Agarwal authored
    The current output for a failed merge with conflict markers looks something like:
    
      merging foo
      warning: conflicts during merge.
      merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
      merging bar
      warning: conflicts during merge.
      merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
    
    We're going to change the way merges are done to perform all premerges before
    all merges, so that the output above would look like:
    
      merging foo
      merging bar
      warning: conflicts during merge.
      merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
      warning: conflicts during merge.
      merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
    
    The 'warning: conflicts during merge' line has no context, so is pretty
    confusing.
    
    This patch will change the future output to:
    
      merging foo
      merging bar
      warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
      warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
    
    The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
    that is tricky because we already hint that people run 'hg resolve' to retry
    unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
    based resolution.
    ef1eb6df7071
    History
    simplemerge: move conflict warning message to filemerge
    Siddharth Agarwal authored
    The current output for a failed merge with conflict markers looks something like:
    
      merging foo
      warning: conflicts during merge.
      merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
      merging bar
      warning: conflicts during merge.
      merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
    
    We're going to change the way merges are done to perform all premerges before
    all merges, so that the output above would look like:
    
      merging foo
      merging bar
      warning: conflicts during merge.
      merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
      warning: conflicts during merge.
      merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
    
    The 'warning: conflicts during merge' line has no context, so is pretty
    confusing.
    
    This patch will change the future output to:
    
      merging foo
      merging bar
      warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
      warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
    
    The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
    that is tricky because we already hint that people run 'hg resolve' to retry
    unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
    based resolution.