##// END OF EJS Templates
fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

File last commit:

r6158:23ffe826 default
r6206:0b6f1249 default
Show More
test-execute-bit.out
8 lines | 240 B | text/plain | TextLexer
/ tests / test-execute-bit.out
Bryan O'Sullivan
See if execute bit is honoured when we go back in time
r5490 adding a
Alexis S. L. Carvalho
repo.status: also compare flags for files in the lookup list....
r6158 79abf14474dc tip
% make sure we notice the change of mode if the cached size == -1
n 0 -1 unset a
M a
Bryan O'Sullivan
See if execute bit is honoured when we go back in time
r5490 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d69afc33ff8a
not executable -- whew