Mercurial > hg-stable
changeset 15630:e6868bd17f24
merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 09 Dec 2011 17:58:12 +0100 |
| parents | 2b40513384ca (current diff) 5b66e55c0d93 (diff) |
| children | e5fd140a4e69 c9913ef748f7 |
| files | hgext/largefiles/reposetup.py tests/test-largefiles.t |
| diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/reposetup.py Fri Dec 09 17:34:57 2011 +0100 +++ b/hgext/largefiles/reposetup.py Fri Dec 09 17:58:12 2011 +0100 @@ -166,7 +166,11 @@ unknown = set(result[4]).difference(lfiles) if parentworking: for lfile in unsure: - if ctx1[lfutil.standin(lfile)].data().strip() \ + standin = lfutil.standin(lfile) + if standin not in ctx1: + # from second parent + modified.append(lfile) + elif ctx1[standin].data().strip() \ != lfutil.hashfile(self.wjoin(lfile)): modified.append(lfile) else:
--- a/tests/test-largefiles.t Fri Dec 09 17:34:57 2011 +0100 +++ b/tests/test-largefiles.t Fri Dec 09 17:58:12 2011 +0100 @@ -647,6 +647,23 @@ $ cat sub2/large7 large7 +Test status after merging with a branch that introduces a new largefile: + + $ echo large > large + $ hg add --large large + $ hg commit -m 'add largefile' + $ hg update -q ".^" + $ echo change >> normal3 + $ hg commit -m 'some change' + created new head + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + getting changed largefiles + 1 largefiles updated, 0 removed + $ hg status + M large + Test that a normal file and a largefile with the same name and path cannot coexist.