Merge branch 'jm/svn-pushmergeinfo-fix'

"git svn dcommit" did not take into account the fact that a
svn+ssh:// URL with a username@ (typically used for pushing) refers
to the same SVN repository without the username@ and failed when
svn.pushmergeinfo option is set.

* jm/svn-pushmergeinfo-fix:
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.

diff --combined git-svn.perl
index aa242d4f4f4363736730ccfcb4c2694d5be9a670,0b60c23e2fb716c928dd1b334926bccc25ab998e..76a75d0b3dfe36f0c82c3951f8b7b04849f808e1
--- 1/git-svn.perl
--- 2/git-svn.perl
+++ b/git-svn.perl
@@@ -931,6 -931,7 +931,7 @@@ sub cmd_dcommit 
                # information from different SVN repos, and paths
                # which are not underneath this repository root.
                my $rooturl = $gs->repos_root;
+               Git::SVN::remove_username($rooturl);
                foreach my $d (@$linear_refs) {
                        my %parentshash;
                        read_commit_parents(\%parentshash, $d);
@@@ -1865,7 -1866,6 +1866,7 @@@ sub get_commit_entry 
                        }
                }
                $msgbuf =~ s/\s+$//s;
 +              $msgbuf =~ s/\r\n/\n/sg; # SVN 1.6+ disallows CRLF
                if ($Git::SVN::_add_author_from && defined($author)
                    && !$saw_from) {
                        $msgbuf .= "\n\nFrom: $author";