Commit 75138390 authored by darin's avatar darin
Browse files

* Scripts/svn-apply: Added comments about things we should do to improve.

        * Scripts/svn-create-patch: Ditto.
        * Scripts/svn-unapply: Ditto.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12488 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent af4a8f90
2006-01-29 Darin Adler <darin@apple.com>
* Scripts/svn-apply: Added comments about things we should do to improve.
* Scripts/svn-create-patch: Ditto.
* Scripts/svn-unapply: Ditto.
2006-01-28 Darin Adler <darin@apple.com>
* DumpRenderTree/DumpRenderTree.m: (dump): Dump the image if it's not
......
......@@ -32,13 +32,22 @@
#
# Handles added files (does a svn add).
# Handles removed files (does a svn rm).
# Has mode where it will roll back to svn version numbers in the patch file so svn can do a 3-way merge.
# Has mode where it will roll back to svn version numbers in the patch file so svn
# can do a 3-way merge.
# Paths from Index: lines are used rather than the paths on the patch lines, which
# makes patches generated by "cvs diff" work (increasingly unimportant since we
# use Subversion now).
#
# Missing features:
#
# Handle binary files.
# When doing a removal, doesn't check that old file matches what's being removed.
# Handle property changes.
# Handle binary files (requires patches made by svn-create-patch).
# Handle file moves (requires patches made by svn-create-patch).
# When doing a removal, check that old file matches what's being removed.
# Notice a patch that's being applied at the "wrong level" and make it work anyway.
# Do a smart merge on ChangeLog files instead of just doing a normal patch.
# Do a dry run on the whole patch and don't do anything if part of the patch is
# going to fail (probably too strict unless we do the ChangeLog thing).
use strict;
use Cwd;
......
......@@ -30,11 +30,12 @@
# Differences from standard "svn diff":
#
# Uses the real diff, not svn's built-in diff.
# Always passes "-p" to diff so it will try to include function names.
# Other command line options are not supported.
#
# Missing feature:
# Missing features:
#
# Sort the diffs, since svn emits them in a seemingly-random order.
# Handle binary files (some text form of the binary file).
# Handle moved files.
......@@ -112,7 +113,7 @@ sub diff
my ($dir, $base) = getDirAndBase($path);
my $errors = "";
chdir $dir or die;
open DIFF, "svn diff --diff-cmd diff -x -uNp '$base' |" or die;
open DIFF, "svn diff --diff-cmd diff -x -uNp '$base' |" or die;
my $indexPath;
while (<DIFF>) {
if (/^Index: (.*)/) {
......
......@@ -28,18 +28,25 @@
# "patch" script for Web Kit Open Source Project, used to apply patches.
# Differences from invoking "patch -p0":
# Differences from invoking "patch -p0 -R":
#
# Paths from Index: lines are used rather than the paths on the patch lines, which makes
# patches generated by "cvs diff" work.
# Handles added files (does a cvs add).
# Handles removed files (does a cvs rm).
# Handles added files (does a svn rm).
# Handles removed files (does a svn add).
# Paths from Index: lines are used rather than the paths on the patch lines, which
# makes patches generated by "cvs diff" work (increasingly unimportant since we
# use Subversion now).
#
# Missing features:
#
# Use CVS version numbers in the patch file and do a 3-way merge.
# Handle binary files.
# When reversing an addition, doesn't check that file matches what's being removed.
# Handle property changes.
# Handle binary files (requires patches made by svn-create-patch).
# Handle file moves (requires patches made by svn-create-patch).
# Use version numbers in the patch file and do a 3-way merge.
# When reversing an addition, check that the file matches what's being removed.
# Notice a patch that's being unapplied at the "wrong level" and make it work anyway.
# Do a smart merge on ChangeLog files instead of just doing a normal patch.
# Do a dry run on the whole patch and don't do anything if part of the patch is
# going to fail (probably too strict unless we do the ChangeLog thing).
use strict;
use Cwd;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment