FTR, these are the additional (corrected in the case of "(no author)") author mappings I am using for the java repo:
(no author) = No Author <[email protected]> jdonohue = jdonohue <[email protected]> tmiller = tmiller <[email protected]> rameshm = rameshm <[email protected]> Gary On Sat, Apr 20, 2019 at 9:16 AM Gary Gregory <[email protected]> wrote: > Yes, I've been deleting the .git folder after each failed attempt. I have > the latest version of git and svn2git so I'm not sure what's going on... > it's all pretty annoying. > > Can you push you local repo with all tags and branches? > > I'll try with xalan-java next... > > Gary > > On Fri, Apr 19, 2019 at 10:41 PM Bill Blough <[email protected]> > wrote: > >> Hmm... I ran the same command, but my run completed without error and >> git seems to show all of the branches, including Xalan-C_1_11 and >> dbertoni, as well as all of the "unlabeled" branches. >> >> >> Did you run this from a new, clean directory, or the same directory as >> previous attempts? If the latter, then it might be worth trying again >> in a new directory, in case there was some sort of cruft from previous >> attempts that interfered. >> >> >> Beyond that, I'm not really sure. Maybe it's an issue with the version >> of svn2git or the git svn module or some other dependency. >> >> >> On Fri, Apr 19, 2019 at 04:20:01PM -0400, Gary Gregory wrote: >> > Hm... not quite right: I ran: >> > >> > svn2git https://svn.apache.org/repos/asf --username ggregory --authors >> > ./authors.txt --verbose --trunk /xalan/c/trunk --branches >> /xalan/c/branches >> > --tags /xalan/c/tags >> > >> > After a few hours it ended with: >> > >> > ...<SNIP> >> > Running command: git branch -r --no-color >> > svn/GSoC-2012 >> > svn/LotusXSL4C >> > svn/LotusXSL4C_1_0_0 >> > svn/LotusXSL4C_1_3_0 >> > svn/LotusXSL4C_1_3_0-390 >> > svn/LotusXSL4C_1_3_1 >> > svn/Xalan-C_1_11 >> > svn/XalanDocs >> > svn/dbertoni >> > svn/tags/GSoC-2012_start >> > svn/tags/LotusXSL4C_1_2 >> > svn/tags/Xalan-C-1_0_Docs >> > svn/tags/Xalan-C-1_0_Docs@1350852 >> > svn/tags/Xalan-C_1_0_0 >> > svn/tags/Xalan-C_1_10_0 >> > svn/tags/Xalan-C_1_11_0 >> > svn/tags/Xalan-C_1_1_0 >> > svn/tags/Xalan-C_1_2_0 >> > svn/tags/Xalan-C_1_3 >> > svn/tags/Xalan-C_1_3_0 >> > svn/tags/Xalan-C_1_4_0 >> > svn/tags/Xalan-C_1_5_0 >> > svn/tags/Xalan-C_1_5_1 >> > svn/tags/Xalan-C_1_6_0 >> > svn/tags/Xalan-C_1_7_0 >> > svn/tags/Xalan-C_1_8_0 >> > svn/tags/Xalan-C_1_9_0 >> > svn/tags/Xalan-C_1_9_without_MemMgr >> > svn/tags/Xalan_0_30_0 >> > svn/tags/Xalan_0_40_0 >> > svn/tags/xalan_0_20_0 >> > svn/trunk >> > svn/unlabeled-1.1.2 >> > svn/unlabeled-1.1.2.1.2 >> > svn/unlabeled-1.10.2 >> > svn/unlabeled-1.11.2 >> > svn/unlabeled-1.11.2.1.2 >> > svn/unlabeled-1.12.2 >> > svn/unlabeled-1.13.2 >> > svn/unlabeled-1.14.2 >> > svn/unlabeled-1.144.2 >> > svn/unlabeled-1.15.2 >> > svn/unlabeled-1.15.2.2.2 >> > svn/unlabeled-1.15.4 >> > svn/unlabeled-1.16.2 >> > svn/unlabeled-1.17.2 >> > svn/unlabeled-1.18.2 >> > svn/unlabeled-1.19.2 >> > svn/unlabeled-1.19.4 >> > svn/unlabeled-1.2.2 >> > svn/unlabeled-1.2.2.1.2 >> > svn/unlabeled-1.20.2 >> > svn/unlabeled-1.21.2 >> > svn/unlabeled-1.22.2 >> > svn/unlabeled-1.23.2 >> > svn/unlabeled-1.24.2 >> > svn/unlabeled-1.24.4 >> > svn/unlabeled-1.25.2 >> > svn/unlabeled-1.26.2 >> > svn/unlabeled-1.28.2 >> > svn/unlabeled-1.29.2 >> > svn/unlabeled-1.3.2 >> > svn/unlabeled-1.3.2.1.2 >> > svn/unlabeled-1.30.2 >> > svn/unlabeled-1.32.2 >> > svn/unlabeled-1.32.2.1.2 >> > svn/unlabeled-1.33.2 >> > svn/unlabeled-1.34.2 >> > svn/unlabeled-1.35.2 >> > svn/unlabeled-1.37.2 >> > svn/unlabeled-1.38.2 >> > svn/unlabeled-1.39.2 >> > svn/unlabeled-1.4.2 >> > svn/unlabeled-1.4.2.1.2 >> > svn/unlabeled-1.41.2 >> > svn/unlabeled-1.47.2 >> > svn/unlabeled-1.5.2 >> > svn/unlabeled-1.5.2.1.2 >> > svn/unlabeled-1.50.2 >> > svn/unlabeled-1.52.2 >> > svn/unlabeled-1.52.4 >> > svn/unlabeled-1.52.4.1.2 >> > svn/unlabeled-1.52.4.1.2.1.2 >> > svn/unlabeled-1.54.2 >> > svn/unlabeled-1.56.2 >> > svn/unlabeled-1.57.2 >> > svn/unlabeled-1.6.2 >> > svn/unlabeled-1.68.2 >> > svn/unlabeled-1.7.2 >> > svn/unlabeled-1.70.2 >> > svn/unlabeled-1.73.2 >> > svn/unlabeled-1.76.2 >> > svn/unlabeled-1.8.2 >> > svn/unlabeled-1.8.2.1.2 >> > svn/unlabeled-1.80.2 >> > svn/unlabeled-1.85.2 >> > svn/unlabeled-1.9.2 >> > svn/unlabeled-1.99.2 >> > svn/unlabeled-1.99.2.1.2 >> > svn/unlabeled-1.99.4 >> > svn/unlabeled-1.99.4.1.2 >> > svn/unlabeled-1.99.4.1.2.1.2 >> > Running command: git branch --track "GSoC-2012" "remotes/svn/GSoC-2012" >> > fatal: Cannot setup tracking information; starting point >> > 'remotes/svn/GSoC-2012' is not a branch. >> > Running command: git checkout -b "GSoC-2012" "remotes/svn/GSoC-2012" >> > Switched to a new branch 'GSoC-2012' >> > Running command: git checkout -b "LotusXSL4C" "remotes/svn/LotusXSL4C" >> > Switched to a new branch 'LotusXSL4C' >> > Running command: git checkout -b "LotusXSL4C_1_0_0" >> > "remotes/svn/LotusXSL4C_1_0_0" >> > Switched to a new branch 'LotusXSL4C_1_0_0' >> > Running command: git checkout -b "LotusXSL4C_1_3_0" >> > "remotes/svn/LotusXSL4C_1_3_0" >> > Switched to a new branch 'LotusXSL4C_1_3_0' >> > Running command: git checkout -b "LotusXSL4C_1_3_0-390" >> > "remotes/svn/LotusXSL4C_1_3_0-390" >> > Switched to a new branch 'LotusXSL4C_1_3_0-390' >> > Running command: git checkout -b "LotusXSL4C_1_3_1" >> > "remotes/svn/LotusXSL4C_1_3_1" >> > Switched to a new branch 'LotusXSL4C_1_3_1' >> > Running command: git checkout -b "Xalan-C_1_11" >> "remotes/svn/Xalan-C_1_11" >> > error: The following untracked working tree files would be overwritten >> by >> > checkout: >> > LICENSE >> > Please move or remove them before you switch branches. >> > Aborting >> > command failed: >> > git checkout -b "Xalan-C_1_11" "remotes/svn/Xalan-C_1_11" >> > root@ggregory-VirtualBox:/media/sf_git/xalan-c# >> > >> > git branch does not list all the branches as we have them in SVN >> > >> > root@ggregory-VirtualBox:/media/sf_git/xalan-c# git branch >> > GSoC-2012 >> > LotusXSL4C >> > LotusXSL4C_1_0_0 >> > LotusXSL4C_1_3_0 >> > LotusXSL4C_1_3_0-390 >> > * LotusXSL4C_1_3_1 >> > master >> > >> > SVN branches are: https://svn.apache.org/repos/asf/xalan/c/branches/ >> > >> > >> > - GSoC-2012/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/GSoC-2012/> >> > - LotusXSL4C/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/LotusXSL4C/> >> > - LotusXSL4C_1_0_0/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/LotusXSL4C_1_0_0/ >> > >> > - LotusXSL4C_1_3_0/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/LotusXSL4C_1_3_0/ >> > >> > - LotusXSL4C_1_3_0-390/ >> > < >> https://svn.apache.org/repos/asf/xalan/c/branches/LotusXSL4C_1_3_0-390/> >> > - LotusXSL4C_1_3_1/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/LotusXSL4C_1_3_1/ >> > >> > - Xalan-C_1_11/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/Xalan-C_1_11/> >> > - XalanDocs/ >> > <https://svn.apache.org/repos/asf/xalan/c/branches/XalanDocs/> >> > - dbertoni/ < >> https://svn.apache.org/repos/asf/xalan/c/branches/dbertoni/> >> > >> > Any thoughts? >> > >> > Thank you, >> > Gary >> > >> > >> > On Fri, Apr 19, 2019 at 8:34 AM Gary Gregory <[email protected]> >> wrote: >> > >> > > Thank you Bill. I'll give it a go locally... >> > > >> > > Gary >> > > >> > > On Thu, Apr 18, 2019 at 10:54 PM Bill Blough <[email protected]> >> > > wrote: >> > > >> > >> Hi Gary, >> > >> >> > >> I expect that the pmc worked because all of the authors were found in >> > >> the authors.txt. >> > >> >> > >> I did a quick scan of the committers in the java repo, and they're >> all >> > >> in authors.txt, so I expect that will convert without problems as >> well. >> > >> >> > >> As for the c repo, I've been doing some testing here. I also ran into >> > >> the same error with (no author). After some research, I changed the >> (no >> > >> author) line in authors.txt to >> > >> >> > >> (no author) = No Author <[email protected]> >> > >> >> > >> Note the addition of a "name" before the email address. >> > >> >> > >> That allowed be to get further, at which point it gave me an error >> about >> > >> jdonohue missing. So I did basically the same thing, and added >> > >> >> > >> jdonohue = jdonohue <[email protected]> >> > >> >> > >> It's still running, but I expect it will complete without error at >> this >> > >> point. The jdonohue failure was at commit r338318, and it's well >> past >> > >> that and in the 700,000 range now. >> > >> >> > >> >> > >> I'll let it complete. That way, if you want me to push it to >> gitbox, I >> > >> can. >> > >> Or if you'd prefer to do it yourself, that's fine too. If you make >> the >> > >> mods as per above, I don't think you'll have any problems. >> > >> >> > >> Best regards, >> > >> Bill >> > >> >> > >> On Thu, Apr 18, 2019 at 05:36:08PM -0400, Gary Gregory wrote: >> > >> > I tried adding jdonohue like this: >> > >> > >> > >> > (no author) = [email protected] >> > >> > jdonohue = [email protected] >> > >> > a_budroni = Alessandro Budroni <[email protected]> >> > >> > ... >> > >> > >> > >> > I and got the same failure. What is odd is that the original >> authors.txt >> > >> > file worked fine when I converted the pmc repo. I did not git the >> > >> console >> > >> > output to compare unfortunately. >> > >> > >> > >> > Gary >> > >> > >> > >> > On Tue, Apr 16, 2019 at 11:12 AM Bill Blough < >> [email protected]> >> > >> wrote: >> > >> > >> > >> > > Hi Gary, >> > >> > > >> > >> > > Interestingly, (no author) IS defined in the authors.txt file >> (it's >> > >> the >> > >> > > first line). I wonder if it's having a problem because it has a >> space >> > >> > > in it and isn't quoted? You could try quoting it and see if that >> > >> works >> > >> > > (I haven't tried it). >> > >> > > >> > >> > > Alternately, I parsed the list of authors [1] and compared the >> result >> > >> to >> > >> > > the Apache authors.txt. The only name in the c repo log that >> wasn't >> > >> in >> > >> > > authors.txt was jdonohue. So the other solution should be to add >> > >> > > jdonohue to authors.txt (probably with the [email protected] >> > >> address >> > >> > > listed for the (no author) user). >> > >> > > >> > >> > > Hope that helps. >> > >> > > >> > >> > > [1] svn log --xml https://svn.apache.org/repos/asf/xalan/c | >> grep >> > >> > > "<author>" | sort -u | sed -r 's/<author>(.*?)<\/author>/\1/' >> > >> > > >> > >> > > >> > >> > > On Tue, Apr 16, 2019 at 10:31:58AM -0400, Gary Gregory wrote: >> > >> > > > This failed last night: >> > >> > > > >> > >> > > > ggregory@ggregory-VirtualBox:~/share/xalan-c$ svn2git >> > >> > > > https://svn.apache.org/repos/asf --username ggregory --authors >> > >> > > > ./authors.txt --verbose --trunk /xalan/c/trunk --branches >> > >> > > /xalan/c/branches >> > >> > > > --tags /xalan/c/tags >> > >> > > > Running command: git svn init --prefix=svn/ >> --username='ggregory' >> > >> > > > --no-metadata --trunk='/xalan/c/trunk' --tags='/xalan/c/tags' >> > >> > > > --branches='/xalan/c/branches' >> https://svn.apache.org/repos/asf >> > >> > > > Running command: git config --local --get user.name >> > >> > > > Running command: git config --local svn.authorsfile >> ./authors.txt >> > >> > > > Running command: git svn fetch >> > >> > > > Author: (no author) not defined in ./authors.txt file >> > >> > > > >> > >> > > > command failed: >> > >> > > > git svn fetch >> > >> > > > >> > >> > > > Any thoughts? >> > >> > > > >> > >> > > > Yes, I have authors.txt in the current folder and it has the >> same >> > >> > > content I >> > >> > > > used to convert https://svn.apache.org/repos/asf/xalan/pmc >> > >> successfully. >> > >> > > > >> > >> > > > Thank you, >> > >> > > > Gary >> > >> > > >> > >> > > >> --------------------------------------------------------------------- >> > >> > > To unsubscribe, e-mail: [email protected] >> > >> > > For additional commands, e-mail: [email protected] >> > >> > > >> > >> > > >> > >> >> > >> -- >> > >> GPG: 5CDD 0C9C F446 BC1B 2509 8791 1762 E022 7034 CF84 >> > >> >> > >> --------------------------------------------------------------------- >> > >> To unsubscribe, e-mail: [email protected] >> > >> For additional commands, e-mail: [email protected] >> > >> >> > >> >> >> -- >> GPG: 5CDD 0C9C F446 BC1B 2509 8791 1762 E022 7034 CF84 >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> >>
