##// END OF EJS Templates
revert: properly revert to ancestor of p2 during merge (issue5052)...
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.
Pierre-Yves David -
r28192:cb6a952e stable
Show More
Name Size Modified Last Commit Author
/ contrib / docker
apache-server
centos5 Loading ...
centos6 Loading ...
centos7 Loading ...
debian-jessie Loading ...
fedora20 Loading ...
fedora21 Loading ...