That did the trick - thanks! On Fri, Oct 14, 2011 at 10:10 AM, Eric Dalquist <[email protected] > wrote:
> From that branches list page click on add-nblair-branch which should take > you to: > > https://github.com/nblair/svn2git-migration/tree/add-nblair-branch > > There should be a button on the upper right named Pull Request. There are > two screenshots attached with more detail. > > -Eric > > > > > > > On 10/14/11 9:40 AM, Nicholas Blair wrote: > > I'm a bit stuck at the point where I push my changes back. > > I've got my development environment setup completely, cloned the project, > created a local branch, and committed my changes to the local branch. > > When I perform what I believe to be the "push" from my changed branch back > to my master (the original clone), I execute the following: > > git push origin add-nblair-branch > Everything up-to-date > > Here's my repo: > https://github.com/nblair/svn2git-migration > > And you can see my change on the "add-nblair-branch: > https://github.com/nblair/svn2git-migration/branches > > So what steps do I follow from here? > > Thanks! > > On Thu, Oct 13, 2011 at 11:42 PM, Eric Dalquist < > [email protected]> wrote: > >> Yeah, it is a little weird but that is apparently how the git commit >> message stuff works. The name part is just decorative, the email address is >> what matters. >> >> -Eric >> >> >> On 10/13/11 11:28 PM, Carroll, Timothy Dale wrote: >> >> okay. so i think the confusing part was that i don't put my github ID >> anywhere. i just need to put one of the email addresses that is associated >> with my github ID in that file. like this: >> >> tim = tim carroll <[email protected]> >> >> where the name part "tim carroll" is actually completely meaningless and >> arbitrary. i was thinking that somewhere there would be a mapping of my >> jasig ID to my github ID directly. like this: >> >> tim = timit >> >> >> On Oct 13, 2011, at 11:59 PM, Eric Dalquist wrote: >> >> Sorry, my previous reply wasn't very clear. >> >> So for the author mapping feature of svn2git to work we have to have "Name >> <[email protected]> <[email protected]>" format mappings for every SVN committer that the tool >> encounters. Since the chances of getting everyone that has ever committed to >> uPortal (all 74 of them) to create a GitHub account is very small I decided >> to put together two lists. >> >> resolvedAuthors.txt - A best guess at GitHub account info made by looking >> up each SVN account in the Jasig Crowd directory and using the name and >> email address registered for the account. This doesn't even work for really >> old committers so those accounts get fake mappings that look like: >> [email protected] >> <[email protected]><[email protected]>. >> The important thing to remember is that this file is automatically >> generated, there was no hand editing of its data. >> >> mappedAuthors.txt - Explicit SVN username to GitHub account mappings. >> Every existing Jasig committer that has a GitHub account should list the >> mapping between their accounts here. >> >> When I run svn2git I first use the little mergeAuthors.groovy script which >> merges the two files with the mappings in mappedAuthors.txt replacing >> mappings from resolvedAuthors.txt. >> >> So no, the email address don't need to match, the email address in >> resolvedAuthors.txt is a best guess for each svn account. The email address >> in mappedAuthors.txt is your actual GitHub account email address. >> >> -Eric >> >> On 10/13/11 10:34 PM, Carroll, Timothy Dale wrote: >> >> so... they should probably match then... right? email is the common >> denominator to map between the accounts. >> >> >> On Oct 13, 2011, at 11:00 PM, Eric Dalquist wrote: >> >> File 2 is the automated output of looking up the name and email address >> for each svn account name from Crowd. File 1 is overlayed on top of File 2 >> to come up with the mapping file used for doing the migration. >> >> -Eric >> >> On 10/13/11 7:49 PM, Carroll, Timothy Dale wrote: >> >> do the email addresses used in file [1] and [2] need to match? >> >> On Oct 13, 2011, at 5:20 PM, Eric Dalquist wrote: >> >> Details of the uPortal SVN to GitHub migration, reasoning, and FAQ is in >> the wiki: >> https://wiki.jasig.org/display/UPC/Git+Migration+Proposal<https://wiki.jasig.org/display/UPC/Git+Migration+Proposal#GitMigrationProposal-UsernameMapping> >> >> I've done a final test migration of the uPortal SVN repository to: >> https://github.com/edalquist/uPortal-GitTest >> >> *Account Mapping* >> This is using best author mapping data that we could put together from >> those that explicitly have listed their git accounts [1] and account >> information for jasig SVN committers that was compiled from the >> Confluence/Jira services [2]. If you have ever commit to a Jasig project in >> the past and think you may ever commit to uPortal (or make a pull request) >> it would be great to have you setup a GitHub account and get the appropriate >> mapping information added to file [1]. >> >> [1] >> https://github.com/Jasig/svn2git-migration/blob/master/mappedAuthors.txt >> [2] >> https://github.com/Jasig/svn2git-migration/blob/master/resolvedAuthors.txt >> >> The following people currently have commit access to uPortal but have NOT >> yet setup an account on GitHub, meaning that their commit history won't >> transfer AND they won't be able to commit once we've moved. Please either >> email me your GitHub account info (should look like: Eric Dalquist >> <[email protected]> <[email protected]>) or event better, get >> to know git and fork https://github.com/Jasig/svn2git-migration add >> yourself to mappedAuthors.txt and then make a pull request. >> >> - Andrew Wills (awills) >> - Andy Gherna (agherna) >> - Anthony Colebourne (acolebourne) >> - Brad Szabo (bszabo) >> - Cris Holdorph (holdorph) >> - Gary Thompson (gthompson) >> - Lennard Fuller (lfuller) >> - Matthew Polizzotti ([email protected]) >> - Susan Bramhall ([email protected]) >> >> >> *Scheduling* >> 10/20 - Thursday >> 10:00am CDT - https://source.jasig.org/uPortal is made read-only >> 4:00pm CDT - https://github.com/Jasig/uPortal will be live and >> available for uPortal committers >> >> Unless there are objections the schedule will proceed as stated above. >> Realistically the GitHub repo should be available much earlier than 4pm but >> don't plan on making any commits to uPortal on Thursday 10/20 and if you >> have any work in progress make sure it is committed somewhere (create a >> temporary branch if needed) so that you don't have to re-apply the changes >> on the git side of things. >> >> -Eric >> >> >> -- >> >> You are currently subscribed to [email protected] as: >> [email protected] >> To unsubscribe, change settings or access archives, see >> http://www.ja-sig.org/wiki/display/JSG/uportal-dev >> >> >> -- >> >> You are currently subscribed to [email protected] as: >> [email protected] >> To unsubscribe, change settings or access archives, see >> http://www.ja-sig.org/wiki/display/JSG/uportal-dev >> >> >> -- >> >> You are currently subscribed to [email protected] as: >> [email protected] >> To unsubscribe, change settings or access archives, see >> http://www.ja-sig.org/wiki/display/JSG/uportal-dev >> >> > -- > > You are currently subscribed to [email protected] as: > [email protected] > To unsubscribe, change settings or access archives, see > http://www.ja-sig.org/wiki/display/JSG/uportal-dev > > -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev
