##// END OF EJS Templates
Merge with crew-stable
Patrick Mezard -
r7631:0b2ee57d merge default
parent child Browse files
Show More
@@ -370,7 +370,7 b' def recordupdates(repo, action, branchme'
370 elif m == "f": # forget
370 elif m == "f": # forget
371 repo.dirstate.forget(f)
371 repo.dirstate.forget(f)
372 elif m == "e": # exec change
372 elif m == "e": # exec change
373 repo.dirstate.normaldirty(f)
373 repo.dirstate.normallookup(f)
374 elif m == "g": # get
374 elif m == "g": # get
375 if branchmerge:
375 if branchmerge:
376 repo.dirstate.normaldirty(f)
376 repo.dirstate.normaldirty(f)
@@ -15,3 +15,10 b' hg up -q'
15 cat foo
15 cat foo
16 hg st -A
16 hg st -A
17
17
18 echo '% validate update of standalone execute bit change'
19 hg up -C 0
20 chmod -x foo
21 hg ci -m removeexec
22 hg up -C 0
23 hg up
24 hg st
@@ -1,2 +1,7 b''
1 dirty
1 dirty
2 M foo
2 M foo
3 % validate update of standalone execute bit change
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 nothing changed
6 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now