This revision was automatically updated to reflect the committed changes.
Closed by commit rHG91c405f84cf7: sparse: add test showing `hg merge` is broken
while using sparse extension (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit added a comment.
I feel like these two patches are appropriate for stable because this is a
bugfix, so I propose them for stable.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3983
To: pulkit, #hg-reviewers
Cc: mercurial-devel
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds a test to demonstrate that `hg merge` is broken in some cases
while using sparse extension.
The case is when you have a file which is:
-
