Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

2017-09-15 Thread Jason Merrill
On Fri, Sep 15, 2017 at 5:53 PM, Jonathan Nieder wrote: > Jason Merrill wrote: >> On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote: >> > Jason Merrill wrote: > >>>> Subject: Fix merge parent checking with svn.pushmergeinfo. >>>> >&

[PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames.

2017-09-15 Thread Jason Merrill
vn info) before comparing rooturl to branchurl. Signed-off-by: Jason Merrill Reviewed-by: Jonathan Nieder --- git-svn.perl | 1 + 1 file changed, 1 insertion(+) diff --git a/git-svn.perl b/git-svn.perl index fa42364785..3b95d67bde 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -931,

Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

2017-09-15 Thread Jason Merrill
On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote: > Hi, > > Jason Merrill wrote: > >> Subject: Fix merge parent checking with svn.pushmergeinfo. >> >> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would >> get error messages like &qu

[PATCH] Fix merge parent checking with svn.pushmergeinfo.

2017-09-15 Thread Jason Merrill
url before comparing to branchurl. Signed-off-by: Jason Merrill --- git-svn.perl | 1 + 1 file changed, 1 insertion(+) diff --git a/git-svn.perl b/git-svn.perl index fa42364785..1663612b1c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -931,6 +931,7 @@ sub cmd_dcommit { # inform