##// END OF EJS Templates
largefiles: fix 'hg status' abort after merge...
Martin Geisler -
r15629:5b66e55c stable
parent child Browse files
Show More
@@ -156,7 +156,11 b' def reposetup(ui, repo):'
156 156 ignored, clean) = s
157 157 if parentworking:
158 158 for lfile in unsure:
159 if ctx1[lfutil.standin(lfile)].data().strip() \
159 standin = lfutil.standin(lfile)
160 if standin not in ctx1:
161 # from second parent
162 modified.append(lfile)
163 elif ctx1[standin].data().strip() \
160 164 != lfutil.hashfile(self.wjoin(lfile)):
161 165 modified.append(lfile)
162 166 else:
@@ -645,6 +645,23 b' been very problematic).'
645 645 $ cat sub2/large7
646 646 large7
647 647
648 Test status after merging with a branch that introduces a new largefile:
649
650 $ echo large > large
651 $ hg add --large large
652 $ hg commit -m 'add largefile'
653 $ hg update -q ".^"
654 $ echo change >> normal3
655 $ hg commit -m 'some change'
656 created new head
657 $ hg merge
658 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
659 (branch merge, don't forget to commit)
660 getting changed largefiles
661 1 largefiles updated, 0 removed
662 $ hg status
663 M large
664
648 665 Test that a normal file and a largefile with the same name and path cannot
649 666 coexist.
650 667
General Comments 0
You need to be logged in to leave comments. Login now