Show More
@@ -182,6 +182,13 b' def reposetup(ui, repo):' | |||
|
182 | 182 | else: |
|
183 | 183 | added.append(lfile) |
|
184 | 184 | |
|
185 | # at this point, 'removed' contains largefiles | |
|
186 | # marked as 'R' in the working context. | |
|
187 | # then, largefiles not managed also in the target | |
|
188 | # context should be excluded from 'removed'. | |
|
189 | removed = [lfile for lfile in removed | |
|
190 | if lfutil.standin(lfile) in ctx1] | |
|
191 | ||
|
185 | 192 | # Standins no longer found in lfdirstate has been |
|
186 | 193 | # removed |
|
187 | 194 | for standin in ctx1.walk(lfutil.getstandinmatcher(self)): |
@@ -543,4 +543,13 b' changed, even if it is aborted by confli' | |||
|
543 | 543 | $ cat largeX |
|
544 | 544 | largeX |
|
545 | 545 | |
|
546 | Test that "hg status" doesn't show removal of largefiles not managed | |
|
547 | in the target context. | |
|
548 | ||
|
549 | $ hg update -q -C 4 | |
|
550 | $ hg remove largeX | |
|
551 | $ hg status -A largeX | |
|
552 | R largeX | |
|
553 | $ hg status -A --rev '.^1' largeX | |
|
554 | ||
|
546 | 555 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now