upstream/mercurial-mirror Files · mercurial/templates

subrepo: fix for merge inconsistencies...

subrepo: fix for merge inconsistencies Merging ancestors with children is allowed if they are on different named branches. This did not work for subrepo merges before. To fix this inconsistency, the mergefunc() will now use the simple update path only if both versions are on the same named branch. If not, they get merged into a new changeset, just as if you did the merge from the subrepo's root directly.

Friedrich Kastner-Masilko -


            r16196:8ae7626d

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / templates
atom
coal
gitweb
monoblue
paper
raw
rss
spartan
static
map-cmdline.bisect	Loading ...
map-cmdline.changelog	Loading ...
map-cmdline.compact	Loading ...
map-cmdline.default	Loading ...
map-cmdline.xml	Loading ...
template-vars.txt	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