Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
* 'svn-fe' of git://repo.or.cz/git/jrn: tests: kill backgrounded processes more robustly vcs-svn: a void function shouldn't try to return something tests: make sure input to sed is newline terminated vcs-svn: add missing cast to printf argument
This commit is contained in:
@ -214,7 +214,8 @@ static void handle_node(void)
|
||||
if (have_text || have_props || node_ctx.srcRev)
|
||||
die("invalid dump: deletion node has "
|
||||
"copyfrom info, text, or properties");
|
||||
return repo_delete(node_ctx.dst);
|
||||
repo_delete(node_ctx.dst);
|
||||
return;
|
||||
}
|
||||
if (node_ctx.action == NODEACT_REPLACE) {
|
||||
repo_delete(node_ctx.dst);
|
||||
|
Reference in New Issue
Block a user