Mercurial > hg
view tests/test-mq-qdelete.out @ 12382:28ddf67198b2 stable
log: include unmodified-in-merge files in log diff/stat (issue2383)
f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.
This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 23 Sep 2010 01:23:16 +0200 |
parents | 561ff8d9e4f0 |
children |
line wrap: on
line source
adding base abort: qdelete requires at least one revision or patch name abort: cannot delete applied patch c popping c now at: b a b a b series status popping b now at: a a b series status patch a finalized without changeset message 1 [mq]: a 0 base abort: cannot delete revision 3 above applied patches patch d finalized without changeset message patch e finalized without changeset message f 4 [mq]: f 3 [mq]: e 2 [mq]: d 1 [mq]: a 0 base adding base abort: no revisions specified no patches applied abort: revision 0 is not managed abort: cannot delete revision 2 above applied patches popping c now at: b abort: unknown revision 'c'! applying c patch c is empty now at: c patch a finalized without changeset message patch b finalized without changeset message c 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base patch c finalized without changeset message 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base series status