Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-03-03 16:50:42 +01:00
Code Issues Packages Projects Releases Activity

This should make --apply-as-patch work with deletions (fingers crossed :)

Browse Source
This commit is contained in:
Simon Hausmann
2007-03-21 10:57:54 +01:00
parent c6d59cf630
commit f27907b793
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@@ -197,7 +197,7 @@ class P4Sync(Command):
die("unknown modifier %s for %s" % (modifier, path))
if self.applyAsPatch:
system("git-diff-tree -p \"%s^\" \"%s\" | patch -p1" % (id, id))
system("git-diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
else:
system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
system("git cherry-pick --no-commit \"%s\"" % id)