##// END OF EJS Templates
merge: move forgets to the beginning of the action list...
merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.

File last commit:

r13933:3d83c7d7 default
r19987:ba648607 stable
Show More
map-cmdline.compact
12 lines | 460 B | text/plain | TextLexer
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 changeset = '{rev}{tags}{bookmarks}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changeset_quiet = '{rev}:{node|short}\n'
changeset_verbose = '{rev}{tags}{parents} {node|short} {date|isodate} {author}\n {desc|strip}\n\n'
start_tags = '['
tag = '{tag},'
last_tag = '{tag}]'
start_parents = ':'
parent = '{rev},'
last_parent = '{rev}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 start_bookmarks = '['
bookmark = '{bookmark},'
last_bookmark = '{bookmark}]'