nl = "\n"
theirs_newlines[file] = nl
+ shell.call("git", "reset", "--hard", ours_id)
theirs_tree = shell.eval("git", "rev-parse", "%s^{tree}" % theirs_id)
for file in ours_theirs_diff:
try:
continue
if theirs_nl != ours_nl:
if ours_nl is None:
- logging.debug("File had no newlines, ignoring newline style")
+ logging.debug("Our file %s had no newlines, ignoring newline style", file)
else:
- logging.info("Converting our file (3) from %s to %s newlines", repr(ours_nl), repr(theirs_nl))
+ logging.info("Converting our file %s (3) from %s to %s newlines", file, repr(ours_nl), repr(theirs_nl))
convert_newline(file, theirs_nl)
shell.eval("git", "add", file) # XXX batch this
prepare_config() # for Wizard, this usually genericizes config files
continue
if theirs_nl != common_nl:
if common_nl is None:
- logging.debug("File had no newlines, ignoring newline style")
+ logging.debug("Common file %s had no newlines, ignoring newline style", file)
else:
- logging.info("Converting common file (1) from %s to %s newlines", repr(common_nl), repr(theirs_nl))
+ logging.info("Converting common file %s (1) from %s to %s newlines", file, repr(common_nl), repr(theirs_nl))
convert_newline(file, theirs_nl)
shell.eval("git", "add", file) # XXX batch
common_tree = shell.eval("git", "write-tree")