upstream/mercurial-mirror Files · contrib/packaging

sparse: add test showing `hg merge` is broken while using sparse extension...

sparse: add test showing `hg merge` is broken while using sparse extension 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: * modified between current wdir parent and merge base * deleted between merge base and merge destination * excluded from sparse checkout Doing `hg merge` results in file not found error. Next patch will fix this. Differential Revision: https://phab.mercurial-scm.org/D3983

Pulkit Goyal -


            r38779:91c405f8

stable

Name	Size	Modified	Last Commit	Author
/ contrib / packaging
debian
docker
macosx
Makefile	Loading ...
build-linux-wheels.sh	Loading ...
builddeb	Loading ...
buildrpm	Loading ...
dockerdeb	Loading ...
dockerrpm	Loading ...
hg-docker	Loading ...
linux-wheel-centos5-blacklist	Loading ...
mercurial.spec	Loading ...
packagelib.sh	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages