Mercurial > hg

view tests/test-mq-qgoto.out @ 10505:b3311e26f94f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
author Greg Ward <greg-hg@gerg.ca>
date Mon, 15 Feb 2010 15:25:29 -0500
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