Mercurial > hg
comparison tests/test-log.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 | efbc09fdefd8 |
children |
comparison
equal
deleted
inserted
replaced
12381:5965f369314b | 12382:28ddf67198b2 |
---|---|
583 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 583 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
584 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 584 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
585 @@ -0,0 +1,1 @@ | 585 @@ -0,0 +1,1 @@ |
586 +a | 586 +a |
587 | 587 |
588 % issue2383 | |
589 adding a | |
590 adding b | |
591 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
592 created new head | |
593 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
594 (branch merge, don't forget to commit) | |
595 | |
596 % diff | |
597 diff -r b09be438c43a -r 8e07aafe1edc a | |
598 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
599 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
600 @@ -1,1 +1,1 @@ | |
601 -b | |
602 +c | |
603 diff -r b09be438c43a -r 8e07aafe1edc b | |
604 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
605 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
606 @@ -0,0 +1,1 @@ | |
607 +b | |
608 | |
609 % log | |
610 changeset: 3:8e07aafe1edc | |
611 tag: tip | |
612 parent: 2:b09be438c43a | |
613 parent: 1:925d80f479bb | |
614 user: test | |
615 date: Thu Jan 01 00:00:00 1970 +0000 | |
616 files: a | |
617 description: | |
618 3 | |
619 | |
620 | |
621 diff -r b09be438c43a -r 8e07aafe1edc a | |
622 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
623 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
624 @@ -1,1 +1,1 @@ | |
625 -b | |
626 +c | |
627 diff -r b09be438c43a -r 8e07aafe1edc b | |
628 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
629 +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
630 @@ -0,0 +1,1 @@ | |
631 +b | |
632 |