Kiln » largefiles » Unity
Clone URL:  

really weird merge resulting from a fix to code before the rename

Changeset 1219d6bbab5f…

Parents 9818ca264760…

Parents cc99a8e6e2eb…

by Profile picture of User 521Andrew Pritchard <andrewp@fogcreek.com>

Changes to 3 files · Browse files at 1219d6bbab5f Showing diff from parent 9818ca264760 cc99a8e6e2eb Diff from another changeset...

Show Entire File basestore.py Stacked
(No changes)
Change 1 of 1 Show Entire File proto.py Stacked
 
89
90
91
92
93
 
94
95
96
 
89
90
91
 
 
92
93
94
95
@@ -89,8 +89,7 @@
  # in this case: send the data straight through   else:   try: - ret, output = self._callpush("putlfile", fd, sha=sha, - headers={'content-type':'application/mercurial-0.1'}) + ret, output = self._callpush("putlfile", fd, sha=sha)   if ret == "":   raise error.ResponseError(_('putlfile failed:'),   output)
Change 1 of 2 Show Entire File reposetup.py Stacked
 
394
395
396
397
398
399
 
 
400
401
402
 
406
407
408
409
 
410
 
394
395
396
 
 
 
397
398
399
400
401
 
405
406
407
 
408
409
@@ -394,9 +394,8 @@
  repo.__class__ = lfiles_repo     def checkrequireslfiles(ui, repo, **kwargs): - if 'largefiles' not in repo.requirements and lfutil.any_(lfutil.shortname+'/' in f[0] \ - for f in repo.store.datafiles()): - + if 'largefiles' not in repo.requirements and lfutil.any_( + lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):   # work around bug in mercurial 1.9 whereby requirements is a list   # on newly-cloned repos   repo.requirements = set(repo.requirements) @@ -406,5 +405,5 @@
    checkrequireslfiles(ui, repo)   - ui.setconfig('hooks', 'incoming.lfiles', checkrequireslfiles) + ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles)   ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles)