Re: [PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames.
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 15, 2017, 21:54 UTC
- Message-ID
- <20170915215413.GW27425@aiede.mtv.corp.google.com>
- In-Reply-To
- <20170915214653.14720-1-jason@redhat.com>
Jason Merrill wrote:
Show 13 quoted lines
> Previously, svn dcommit of a merge with svn.pushmergeinfo set would > get error messages like "merge parent <X> for <Y> is on branch > svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root > svn+ssh://jason@gcc.gnu.org/svn/gcc!" > > So, let's call remove_username (as we do for svn info) before comparing > rooturl to branchurl. > > Signed-off-by: Jason Merrill <jason@redhat.com> > Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> > --- > git-svn.perl | 1 + > 1 file changed, 1 insertion(+)
This is indeed Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
though it does need a test --- I have no confidence that this fix will be preserved without one. Anyway, that can happen in a separate patch.
Thanks for your work, Jonathan