comparison tests/test-largefiles-update.t @ 22286:3f3b9483e7ef

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 24 Aug 2014 23:47:26 +0900
parents 85bded43cc80
children f3ac9677fa2b
comparison
equal deleted inserted replaced
22285:85bded43cc80 22286:3f3b9483e7ef
138 A largeX 138 A largeX
139 $ cat .hglf/largeX 139 $ cat .hglf/largeX
140 140
141 $ hg status -A largeY 141 $ hg status -A largeY
142 ? largeY 142 ? largeY
143 $ test -f .hglf/largeY
144 [1]
143 145
144 Test that "hg rollback" restores standins correctly 146 Test that "hg rollback" restores standins correctly
145 147
146 $ hg commit -m 'will be rollback-ed soon' 148 $ hg commit -m 'will be rollback-ed soon'
147 $ hg update -q -C 2 149 $ hg update -q -C 2