Mercurial > hg

view tests/test-mq-qgoto.out @ 11346:e740f36cfb4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 13:39:00 -0400
parents 561ff8d9e4f0
children
line wrap: on
line source

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

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

% No warnings when using index
popping bug141421
popping bug314159
popping c.patch
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