##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: respect parents order when using `graft` on a merge...
merge: respect parents order when using `graft` on a merge The previous code did not record the index of the replaced parent. It was always using the "graft" destination as `p1`. This could switch parents order in some situation (eg: some of the evolve evolving merge case). Recording and using the information fixes the issue in evolve. We are not aware of core commands calling graft in that fashion, so we could not build a simple test case for it using core commands.
Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default
r43185:a4ca0610 stable
Show More
map-cmdline.changelog
18 lines | 854 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.changelog
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715 [templates]
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 header = '{date|shortdate} {author|person} <{author|email}>\n\n'
header_verbose = ''
changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}{branches}\n\n'
changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n'
changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags}{branches})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
start_tags = ' ['
tag = '{tag}, '
last_tag = '{tag}]'
start_branches = ' <'
branch = '{branch}, '
last_branch = '{branch}>'
file = '{file}, '
last_file = '{file}:\n\t'
file_add = '{file_add}, '
last_file_add = '{file_add}: new file.\n* '
file_del = '{file_del}, '
last_file_del = '{file_del}: deleted file.\n* '