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

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

bookmarks: correctly update current bookmarks on rebase (issue2277)...
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
Pierre-Yves David - - Load All Authors

File last commit:

r15907:51fc4325 default
r17046:4116504d stable
Show More
map-cmdline.default
25 lines | 1.3 KiB | text/plain | TextLexer
/ mercurial / templates / map-cmdline.default
History | Source | Raw |Copy content |Copy permalink
David Soria Parra
templates: add bookmarks to command line styles
 r13387 changeset = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 changeset_quiet = '{rev}:{node|short}\n'
David Soria Parra
templates: add bookmarks to command line styles
 r13387 changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n'
Pierre-Yves David
changeset_printer: display changeset phase on debug level...
 r15907 changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}phase: {phase}\n{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 start_files = 'files: '
file = ' {file}'
end_files = '\n'
start_file_mods = 'files: '
file_mod = ' {file_mod}'
end_file_mods = '\n'
start_file_adds = 'files+: '
file_add = ' {file_add}'
end_file_adds = '\n'
start_file_dels = 'files-: '
file_del = ' {file_del}'
end_file_dels = '\n'
Greg Ward
Fix default style so 'log --copies' has a start and an end.
 r10776 start_file_copies = 'copies: '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 file_copy = ' {name} ({source})'
Greg Ward
Fix default style so 'log --copies' has a start and an end.
 r10776 end_file_copies = '\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 parent = 'parent: {rev}:{node|formatnode}\n'
manifest = 'manifest: {rev}:{node}\n'
branch = 'branch: {branch}\n'
tag = 'tag: {tag}\n'
David Soria Parra
templates: add bookmarks to command line styles
 r13387 bookmark = 'bookmark: {bookmark}\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 extra = 'extra: {key}={value|stringescape}\n'