##// END OF EJS Templates
merge: remove useless dirstate.normallookup() invocation in applyupdates()...
merge: remove useless dirstate.normallookup() invocation in applyupdates() Explicit 'dirstate.normallookup()' invocation via 'dirtysubstate()' in 'applyupdates()' is useless now, because previous patch fixed the relevant issue by writing in-memory dirstate changes out at the end of dirty check. 'dirstate.normallookup()' invocation was introduced by 6becb9dbca25 to avoid occasional test failure. This is partial backout of it (added tests are still left).

File last commit:

r24907:9570587b default
r25754:19cc443a default
Show More
map-cmdline.phases
3 lines | 248 B | text/plain | TextLexer
Yuya Nishihara
template-phases: extend default style instead of duplicating it...
r24907 %include map-cmdline.default
Jordi Gutiérrez Hermoso
log: add labels to the phase template...
r22767 changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
Jordi Gutiérrez Hermoso
log: show phase in hg log -v with the phase template...
r22768 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'