Mercurial > hg
view contrib/plan9/proto @ 28192:cb6a952efbf4 stable
revert: properly revert to ancestor of p2 during merge (issue5052)
During merge, added (from one perspective) file can be reported as "modified".
To work around that, revert was testing if modified file were present in the
parent manifest and marking them as "added" in this case. However, we should be
checking against the target revision manifest instead. Otherwise see file as
"newly added" even if they exist in the target revision.
That revert behavior regressed in 06fbd9518bc5.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 23 Feb 2016 11:41:47 +0100 |
| parents | cf137319c6cd |
| children |
line wrap: on
line source
lib - sys sys mercurial - sys sys hgrc.d - sys sys 9diff.rc - sys sys factotum.rc - sys sys rc - sys sys bin - sys sys 9diff - sys sys hg - sys sys sys - sys sys lib - sys sys python - sys sys lib - sys sys python2.5 - sys sys site-packages - sys sys hgext - sys sys + - sys sys mercurial - sys sys + - sys sys mercurial-VERSION-py2.5.egg-info - sys sys src - sys sys cmd - sys sys hg - sys sys + - sys sys