Skip to content
Snippets Groups Projects
  • Mads Kiilerich's avatar
    dc5157841361
    rebase: improve error message for --base being empty or causing emptiness · dc5157841361
    Mads Kiilerich authored
    Before it just said 'nothing to rebase'.
    
    Now 'if "base" is an empty set:
      abort: empty "base" revision set - can't compute rebase set
    
    If the set of changesets to rebase can't be found from "base", it will fail as
    before but with more explanation of what the problem was.
    
    The name of the "base" option is not obvious - it is more like "samples
    identifying the branch to rebase". The error messages for problems with the
    specified "base" value will use that term and might thus also not be obvious,
    but at least they are consistent with the option name. The name "base" will not
    be used if the base only was specified implicitly as the working directory
    parent.
    dc5157841361
    History
    rebase: improve error message for --base being empty or causing emptiness
    Mads Kiilerich authored
    Before it just said 'nothing to rebase'.
    
    Now 'if "base" is an empty set:
      abort: empty "base" revision set - can't compute rebase set
    
    If the set of changesets to rebase can't be found from "base", it will fail as
    before but with more explanation of what the problem was.
    
    The name of the "base" option is not obvious - it is more like "samples
    identifying the branch to rebase". The error messages for problems with the
    specified "base" value will use that term and might thus also not be obvious,
    but at least they are consistent with the option name. The name "base" will not
    be used if the base only was specified implicitly as the working directory
    parent.