From: Joseph Mingrone <jrm@ftfl.ca>
To: git@vger.kernel.org
Subject: git-svn authors file in repo (Author: xxx not defined in .gitauthors file)
Date: Thu, 19 Sep 2019 11:34:21 -0300 [thread overview]
Message-ID: <86o8zgfj82.fsf@phe.ftfl.ca> (raw)
[-- Attachment #1: Type: text/plain, Size: 1563 bytes --]
Hello,
We maintain a .gitauthors file for git-svn. When a new committer is
added to our project, a new entry is added to the .gitauthors file,
but we sometimes see errors like this:
% git -C /usr/ports svn rebase
M .gitauthors
r512146 = 0c1f924ca984d53333beabb909ea53afb856c44b (refs/remotes/origin/trunk)
M math/py-pystan/Makefile
r512147 = acc387d4c8f3ebf904010bccc5679be06b184a9d (refs/remotes/origin/trunk)
M deskutils/gworkspace-gwmetadata/Makefile
...
...
...
r512184 = 442bd1025776d5e3171be8e497ef2056dc47ff06 (refs/remotes/origin/trunk)
M www/rubygem-passenger/Makefile
M www/rubygem-passenger/distinfo
D www/rubygem-passenger/files/patch-asio-libc++7
W: -empty_dir: head/www/rubygem-passenger/files/patch-asio-libc++7
r512185 = f1a1b447811ae84011288678136e185c83180b8e (refs/remotes/origin/trunk)
M astro/xearth/files/freebsd.committers.markers
Author: dmgk not defined in .gitauthors file
The new committer, dmgk, was added to .gitauthors in svn commit r512146,
then later he committed to the repository for the first time in r512185.
It seems that if these two commits are included in the same `git svn
rebase`, the error above will occur.
Is there a solution or workaround for this aside from each committer
having an updated .gitauthors before doing `git svn rebase`. It's seems
to be a chicken/egg issue; they first need the updated .gitauthors file,
but the way to get the updated .gitauthors files is to do `git svn
rebase`.
Regards,
Joseph
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 979 bytes --]
next reply other threads:[~2019-09-19 14:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 14:34 Joseph Mingrone [this message]
2019-09-19 23:18 ` git-svn authors file in repo (Author: xxx not defined in .gitauthors file) SZEDER Gábor
2019-09-20 6:49 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86o8zgfj82.fsf@phe.ftfl.ca \
--to=jrm@ftfl.ca \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.