On 01/27/2017 05:01 PM, Jeff Law wrote:
On 01/27/2017 02:28 PM, Martin Sebor wrote:
On 01/27/2017 11:20 AM, Jason Merrill wrote:
On Fri, Jan 27, 2017 at 11:56 AM, Martin Sebor <mse...@gmail.com> wrote:
FWIW, I could avoid this awkward setup if I had just one repo for all
my changes, shared across my various machines. Unfortunately, for it
to really work I would also need to be able to commit using Git rather
than Subversion which doesn't work. At least not according to the
instructions on the Wiki.
What's the problem?
We discussed it in the thread below:
https://gcc.gnu.org/ml/gcc-patches/2016-02/msg00335.html
I think Jonathan and/or Ville had some suggestions on IRC for how
to work around the broken setup. I never got it to work but I also
didn't try too hard, thinking the Git conversion would be done soon.
I don't remember the errors I was getting then but I just tried to
follow the Wiki steps again. On tor git svn init fails like so:
$ git svn init -s --prefix=svn/ svn+ssh://mse...@gcc.gnu.org/svn/gcc
Network connection closed unexpectedly: Unable to connect to a
repository at URL 'svn+ssh://mse...@gcc.gnu.org/svn/gcc': To better
debug SSH connection problems, remove the -q option from 'ssh' in the
[tunnels] section of your Subversion configuration file. at
/usr/share/perl5/vendor_perl/Git/SVN.pm line 310.
(Removing the -q option from the [tunne;s] section of my
~/.subversion/config file has no effect.)
On my machine, git svn init and the rest of the steps succeeded (as
they did before) but commit failed (as it did before, though possibly
with a different error). The one I get now is:
$ git svn dcommit
Cannot dcommit with a dirty index. Commit your changes first, or stash
them with `git stash'.
at /usr/libexec/git-core/git-svn line 836.
I did a quick search online for the error. I see others as confused
by it as I am and various suggestions to run various commands none
of which works.
I understand you can commit from your existing repo but does following
all the steps as I did work for you? How about on tor?
So I would start with a checkout of a git tree, then use the
instructions to turn that into a SVN-writable tree. Those have worked
flawless for me in the past.
You can also do something like
ssh -v mse...@gcc.gnu.org ls
To see if anything useful comes up.
THe dirty index means you've got local changes that are not committed.
What does a "git status" report?
Aha! That's the missing step from the Wiki! Once I commit the changes
to my local repository git svn dcommit succeeds and pushes them to the
FSF repository. Let me update the Wiki to make this clear.
Thanks for the hint.
Martin
