diff options
Diffstat (limited to 'merge.upstream.sh')
| -rwxr-xr-x | merge.upstream.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge.upstream.sh b/merge.upstream.sh index eedc148ec..5c54da2b9 100755 --- a/merge.upstream.sh +++ b/merge.upstream.sh @@ -48,13 +48,13 @@ echo " vex : $upstream_vex_revision" if [ $upstream_valgrind_revision -gt $valgrind_revision ]; then echo "Merging valgrind... (in $valgrind_dir)" | tee $current_dir/merge.log cd $valgrind_dir - svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi if [ $upstream_vex_revision -gt $vex_revision ]; then echo "Merging vex... (in $vex_dir)" | tee -a $current_dir/merge.log cd $vex_dir - svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi echo "val: $upstream_valgrind_revision" > $current_dir/upstream.revs.txt |