##// END OF EJS Templates
rebase: move working parent and bookmark for obsoleted revs (BC)...
rebase: move working parent and bookmark for obsoleted revs (BC) Previously, obsoleted revs with successors in destination are completely ignored. That caused some inconvenience when working copy is obsoleted. Most commands avoid working copy being obsoleted, but `hg pull` is an exception. This patch makes rebase able to move bookmarks or working parent for those obsoleted revs. It does so by keeping the obsoleted revs in `state` and marking them as "skipped, rebased to desired destination" during run-time. This reverts part of the behavior change of 3b7cb3d17137 and D24. Differential Revision: https://phab.mercurial-scm.org/D527

File last commit:

r19429:c8490dcc default
r34010:9422107a default
Show More
map
42 lines | 1.2 KiB | text/plain | TextLexer
Matt Mackall
hgweb: avoid traceback if raw is used as default style...
r17277 default = 'shortlog'
shortlog = "'raw' is not a browsable style"
Alexander Plavin
hgweb: add changelog and search templates to raw style...
r19429 changelog = changelog.tmpl
changelogentry = logentry.tmpl
search = search.tmpl
searchentry = logentry.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 mimetype = 'text/plain; charset={encoding}'
header = ''
footer = ''
changeset = changeset.tmpl
difflineplus = '{line}'
difflineminus = '{line}'
difflineat = '{line}'
diffline = '{line}'
changesetparent = '# Parent {node}'
changesetchild = '# Child {node}'
filenodelink = ''
Matt Mackall
templates: add filenolink to raw style (issue2332)
r11936 filenolink = ''
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 fileline = '{line}'
diffblock = '{lines}'
filediff = filediff.tmpl
fileannotate = fileannotate.tmpl
annotateline = '{author|user}@{rev}: {line}'
manifest = manifest.tmpl
direntry = 'drwxr-xr-x {basename}\n'
fileentry = '{permissions|permissions} {size} {basename}\n'
index = index.tmpl
notfound = notfound.tmpl
error = error.tmpl
indexentry = '{url}\n'
tags = '{entries%tagentry}'
tagentry = '{tag} {node}\n'
Yuya Nishihara
hgweb: add bookmarks listing to raw style with test case
r13921 bookmarks = '{entries%bookmarkentry}'
bookmarkentry = '{bookmark} {node}\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 branches = '{entries%branchentry}'
branchentry = '{branch} {node} {status}\n'
Paul Boddie
hgweb: make graph data suitable for template usage...
r16773 graph = graph.tmpl
graphnode = graphnode.tmpl
graphedge = graphedge.tmpl
bookmarkname = 'bookmark: {name}\n'
branchname = 'branch: {name}\n'
tagname = 'tag: {name}\n'