2

以下是我的配置的相关部分：

$ cat .git/config
[svn-remote "svn"]
        ignore-paths = ^(?:Releases|Projects|Scripts|Games|)/|^Programs/(?:Nif S\
canner|Nif Viewer|Raziel23x's Oblivion Toolset|Shader Disasm|Shader Editor)/
        url = svn://svn.code.sf.net/p/oblivionworks/code
        fetch = Programs/Wrye Bash:refs/remotes/svn/trunk
        branches = Branches/Wrye Bash/*:refs/remotes/svn/*
        tags = Tags/Wrye Bash/*:refs/remotes/svn/tags/*
[svn]
        authorsfile = authors_with_emails.txt

试过：

MrD@MRSD /c/dropbox/eclipse_workspaces/python/git_svn_WB (master)
$ git svn dcommit --username MYUSERNAME
Committing to svn://svn.code.sf.net/p/oblivionworks/code/Programs/Wrye%20Bash ...

ERROR from SVN:
Authorization failed: Authorization failed
W: 083f21d9aa799b62e325b5bb348f1ee82f9d7085 and refs/remotes/svn/trunk differ, u
sing rebase:
:040000 040000 f8e70f1f4670274788def25b32bd5d7246206b7b f05b3db6f8d2ea5ff54cd040
c4ef685cdd453233 M      Mopy
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.

如您所见，我在 master （我只是从 git 分支中挑选了一个提交 - 没有花哨的合并和东西）

我有两个问题：

  • 如何调整配置中的 url - 或者我<URL>应该将什么传递给--commit-url <URL>flag ？我不想搞砸任何事情并最终在错误的分支中提交（如您所见，svn 布局是非标准的）

  • 实际上我正在提交另一个人的更改。我编辑了提交消息以添加：

    Subject

Body

Signed-off-by: AUTHOR <EMAIL> # added

    whereAUTHOR匹配 SVN 配置中的名称，但EMAIL不匹配。这足以让作者被正确记录吗？我相信电子邮件不会在 SVN 方面有所作为

我只是想更加确定，因为我不想弄乱 SVN 回购。我宁愿推过去https。

4

0 回答 0