Mercurial Mercurial > hg / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-default.t
changeset 45827 8d72e29ad1e0
parent 43873 8caec25f5d8f
child 49621 55c6ebd11cb9
equal deleted inserted replaced
45826:21733e8c924f 45827:8d72e29ad1e0 
    67 Should fail because we didn't specify a revision (even though it would have
 
    67 Should fail because we didn't specify a revision (even though it would have
 
    68 succeeded without this):
 
    68 succeeded without this):
 
    69 
    69 
    70   $ hg merge --config commands.merge.require-rev=True
 
    70   $ hg merge --config commands.merge.require-rev=True
 
    71   abort: configuration requires specifying revision to merge with
 
    71   abort: configuration requires specifying revision to merge with
 
    72   [255]
 
    72   [10]
 
    73 
    73 
    74 Should succeed - 2 heads:
 
    74 Should succeed - 2 heads:
 
    75 
    75 
    76   $ hg merge -P
 
    76   $ hg merge -P
 
    77   changeset:   3:ea9ff125ff88
 
    77   changeset:   3:ea9ff125ff88
 
    99 Should fail because we didn't specify a revision (even though it would have
 
    99 Should fail because we didn't specify a revision (even though it would have
 
   100 failed without this due to being on tip, but this check comes first):
 
   100 failed without this due to being on tip, but this check comes first):
 
   101 
   101 
   102   $ hg merge --config commands.merge.require-rev=True
 
   102   $ hg merge --config commands.merge.require-rev=True
 
   103   abort: configuration requires specifying revision to merge with
 
   103   abort: configuration requires specifying revision to merge with
 
   104   [255]
 
   104   [10]
 
   105 
   105 
   106 Should fail because at tip:
 
   106 Should fail because at tip:
 
   107 
   107 
   108   $ hg merge
 
   108   $ hg merge
 
   109   abort: nothing to merge
 
   109   abort: nothing to merge
Mercurial