# A case of incompetent upstream, unfortunately
logging.warning("Canonical version (theirs) of %s has mixed newline style, forced to \\n", file)
else:
- logging.info("Canonical version (theirs) of %s had no newline style, using \\n", file)
+ logging.debug("Canonical version (theirs) of %s had no newline style, using \\n", file)
nl = "\n"
theirs_newline_cache[file] = nl
return theirs_newline_cache[file]
except (IOError, shell.CallError): # hack
continue
if theirs_nl != ours_nl:
- logging.info("Converting our file (3) from %s to %s newlines", repr(ours_nl), repr(theirs_nl))
- convert_newline(file, theirs_nl)
- shell.eval("git", "add", file)
+ if ours_nl == None:
+ logging.debug("File had no newlines, ignoring newline style")
+ else:
+ logging.info("Converting our file (3) from %s to %s newlines", repr(ours_nl), repr(theirs_nl))
+ convert_newline(file, theirs_nl)
+ shell.eval("git", "add", file)
prepare_config() # for Wizard, this usually genericizes config files
ours_tree = shell.eval("git", "write-tree")
logging.info("Merge wrote virtual tree for ours: %s", ours_tree)