Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
345e31e1
Commit
345e31e1
authored
Nov 03, 2017
by
gejun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
list rej files after patching & add -l to patch
parent
a45df223
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
patch_from_svn
tools/patch_from_svn
+8
-1
No files found.
tools/patch_from_svn
View file @
345e31e1
...
...
@@ -72,4 +72,11 @@ if [ -z "$DO_RUN" ]; then
EXTRA_ARGS
=
"--dry-run
$EXTRA_ARGS
"
echo
"*** This is a dry-run. To really apply, run: DO_RUN=1 tools/patch_from_svn
$1
"
fi
patch
-p0
-u
$EXTRA_ARGS
<
$MODIFIED_PATCHFILE
patch
-p0
-u
-l
$EXTRA_ARGS
<
$MODIFIED_PATCHFILE
if
[
!
-z
"
$DO_RUN
"
]
;
then
REJ_FILES
=
`
find
.
-name
"*.rej"
`
if
[
!
-z
"
$REJ_FILES
"
]
;
then
echo
"==== The patching is not done yet! Apply following rej files manually ===="
echo
$REJ_FILES
fi
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment