view tests/test-mq-qgoto.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents fb32ae9c76e7
children 561ff8d9e4f0
line wrap: on
line source

adding a
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
now at: b.patch

% Using index
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch

% No warnings when using index
now at: b.patch
applying c.patch
applying bug314159
now at: bug314159

% Detect ambiguous non-index
patch name "14" is ambiguous:
  bug314159
  bug141421
abort: patch 14 not in series