Re: [Rails-devel] Git repository is now available.

[brett l. <bre...@gm...>]

Bill -

Yup. That's a fairly normal workflow for Git.

Rebasing your local commit history for public consumption is one of
the nicer things Git supports. However, because it does change the
repository's history, it's a bit tricky to get correct.

The most important detail is that once changes are pushed to the
public repository, they shouldn't be changed. See the "recovering from
an upstream rebase" portion of the 'git rebase' man page:
http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

---Brett.



On Sun, Jul 17, 2011 at 11:07 PM, Bill Rosgen <ro...@gm...> wrote:
> I'm somewhat new to Git and so have a workflow question.  Let me know if the following seems reasonable, especially step 3:
>
> 1. Alice wishes to add a new feature (say, support for 1848).  She creates a local branch (1848-dev) and begins work.
>
> 2. Alice makes several commits to her local branch while implementing this feature.  In the mean-time, the master branch will have also changed.
>
> 3. Alice rebases her local branch on top of the current state of the master branch and fixes any conflicts.  As she does this she squashes all of her local commits into one commit as the rest of the developers probably don't want or need all of her committed but only partially implemented versions of the feature.
>
> 4. Now that her local branch is one commit away from the current master, Alice creates and sends a patch that implements the new feature.
>
> (I'm still working on 1848, but it's quite far being from done: I haven't sent anything, as I don't know how useful it is to have another partially implemented (unplayable) game.)
>
> Bill
>
> On 2011-07-18, at 3:19 , brett lentz wrote:
>
>> I've migrated all of the commits up to r1614 from SVN into the Git
>> repository on SF.net.
>>
>> Currently, none of the tags have been migrated due to differences in
>> how SVN and Git handle tags. I'll be pushing the tags up as soon as I
>> have them ready.
>>
>> Important note for committers:
>>
>> Please set up your .gitconfig to include your name and e-mail address
>> for all future commits.
>>
>> During the migration, you'll note I've converted all existing commits
>> to use this information. To have the tree remain consistent, you'll
>> need to follow suit.
>>
>> ---Brett.
>>
>>
>>
>> On Mon, Jul 11, 2011 at 1:31 PM, Erik Vos <eri...@xs...> wrote:
>>> That would be great.  Thanks.
>>> Erik.
>>>
>>>> -----Original Message-----
>>>> From: brett lentz [mailto:bre...@gm...]
>>>> Sent: Monday, July 11, 2011 9:45 PM
>>>> To: Development list for Rails: an 18xx game
>>>> Subject: Re: [Rails-devel] Are we ready for Git?
>>>>
>>>> I'll work on it this week.  This coming weekend should be a good target for
>>>> the cutover.
>>>>
>>>> ---Brett.
>>>>
>>>>
>>>>
>>>> On Mon, Jul 11, 2011 at 12:32 PM, Erik Vos <eri...@xs...> wrote:
>>>>> OK, it seems we are ready then for the switchover.
>>>>>
>>>>> Brett, when do you think you can have rebuilt the Git repo at Sourceforge?
>>>>> I suppose it's better to create a fresh new repository than to do a
>>>>> massive update to get the current old one up to date.
>>>>>
>>>>> Erik.
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Phil Davies [mailto:de...@gm...]
>>>>>> Sent: Monday, July 11, 2011 10:56 AM
>>>>>> To: Development list for Rails: an 18xx game
>>>>>> Subject: Re: [Rails-devel] Are we ready for Git?
>>>>>>
>>>>>> As far as I'm concerned it's really Brett, Erik and Stefan's decision
>>>>> being the
>>>>>> primary contributors to the project.  IntelliJ has a Git plugin so
>>>>>> I'm
>>>>> sure I'll
>>>>>> work it out :)
>>>>>>
>>>>>> Phil
>>>>>>
>>>>>> On 11 July 2011 06:04, Stefan Frey <ste...@we...> wrote:
>>>>>>> Erik & Brett,
>>>>>>> given that you both had some long-time hands-on-experience with
>>>>>>> Maven (compared to my third-party recommendation and a short
>>>>>>> try-out) I agree to stay with the current setup.
>>>>>>> I had not tested EGit/JGit before, thus I considered them as
>>>>>>> competing products similar to the svn-support in eclipse ;-) Stefan
>>>>>>>
>>>>>>> On Sunday, July 10, 2011 07:08:05 pm brett lentz wrote:
>>>>>>>> On Sun, Jul 10, 2011 at 9:24 AM, Erik Vos <eri...@xs...> wrote:
>>>>>>>>>> -----Original Message-----
>>>>>>>>>> From: Stefan Frey [mailto:ste...@we...]
>>>>>>>>>> Sent: Sunday, July 10, 2011 2:42 PM
>>>>>>>>>> To: Development list for Rails: an 18xx game
>>>>>>>>>> Subject: Re: [Rails-devel] Are we ready for Git?
>>>>>>>>>>
>>>>>>>>>> Erik & Brett,
>>>>>>>>>> I am up for that move. Do you recommend JGit or Egit?
>>>>>>>>>
>>>>>>>>> AFAIK you need both (in Eclipse).
>>>>>>>>
>>>>>>>> Correct.
>>>>>>>>
>>>>>>>> JGit is the java git implementation.
>>>>>>>> EGit is the eclipse plugin built on top of JGit.
>>>>>>>>
>>>>>>>>>> I am wondering if you would consider to move to a maven  build
>>>>>>>>>> at the same time. Ideally by changing to the maven recommended
>>>>>>>>>> repo
>>>>>> layout.
>>>>>>>>>
>>>>>>>>> Dunno. Brett is handling the builds (I only run either from
>>>>>>>>> Eclipse Run or from the published Rails jars).
>>>>>>>>>
>>>>>>>>> I hardly know anything about Maven. In the past I have been
>>>>>>>>> half-involved with some (old) projects that used Maven, and
>>>>>>>>> perhaps
>>>>>> some other stuff.
>>>>>>>>> What I remember about these projects was the ubiquitous presence
>>>>>>>>> of pom.xml files that did not mean anything to me (I wasn't
>>>>>>>>> really interested either - it worked). So I'm blank.
>>>>>>>>
>>>>>>>> I deal with Maven at my day job, and I'm not a fan. Perhaps as
>>>>>>>> Maven
>>>>>>>> 3 matures, it will improve in crucial areas. Right now, I really
>>>>>>>> dislike the way it handles dependency resolution, among other things.
>>>>>>>>
>>>>>>>>> Perhaps we'll better restrict ourselves to one major step at a time?
>>>>>>>>
>>>>>>>> Agreed.
>>>>>>>>
>>>>>>>>> One thing on our Git repo that I have struggled with yesterday
>>>>>>>>> is that it seems to require that the .git directory would exist
>>>>>>>>> at the same level as all project directories (game, tile, data
>>>>>>>>> etc.).  I was trying to get these directories below a src
>>>>>>>>> directory on the same level as .git (under the project root),
>>>>>>>>> but failed  to get there. Not really a problem, but perhaps
>>>> noteworthy.
>>>>>>>>>
>>>>>>>>> Erik.
>>>>>>>>
>>>>>>>> ---Brett.
>>>>>>>>
>>>>>>>> ------------------------------------------------------------------
>>>>>>>> ---
>>>>>>>> ------
>>>>>>>> --- All of the data generated in your IT infrastructure is
>>>>>>>> seriously valuable. Why? It contains a definitive record of
>>>>>>>> application performance, security threats, fraudulent activity,
>>>>>>>> and more. Splunk takes this data and makes sense of it. IT sense. And
>>>> common sense.
>>>>>>>> http://p.sf.net/sfu/splunk-d2d-c2
>>>>>>>> _______________________________________________
>>>>>>>> Rails-devel mailing list
>>>>>>>> Rai...@li...
>>>>>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>>>>>
>>>>>>> -------------------------------------------------------------------
>>>>>>> ---
>>>>>>> -------- All of the data generated in your IT infrastructure is
>>>>>>> seriously valuable.
>>>>>>> Why? It contains a definitive record of application performance,
>>>>>>> security threats, fraudulent activity, and more. Splunk takes this
>>>>>>> data and makes sense of it. IT sense. And common sense.
>>>>>>> http://p.sf.net/sfu/splunk-d2d-c2
>>>>>>> _______________________________________________
>>>>>>> Rails-devel mailing list
>>>>>>> Rai...@li...
>>>>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>>>>>
>>>>>>
>>>>>>
>>>>> ----------------------------------------------------------------------
>>>>> ------
>>>>> --
>>>>>> All of the data generated in your IT infrastructure is seriously valuable.
>>>>>> Why? It contains a definitive record of application performance,
>>>>>> security threats, fraudulent activity, and more. Splunk takes this
>>>>>> data and makes sense of it. IT sense. And common sense.
>>>>>> http://p.sf.net/sfu/splunk-d2d-c2
>>>>>> _______________________________________________
>>>>>> Rails-devel mailing list
>>>>>> Rai...@li...
>>>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>>>
>>>>>
>>>>> ----------------------------------------------------------------------
>>>>> -------- All of the data generated in your IT infrastructure is
>>>>> seriously valuable.
>>>>> Why? It contains a definitive record of application performance,
>>>>> security threats, fraudulent activity, and more. Splunk takes this
>>>>> data and makes sense of it. IT sense. And common sense.
>>>>> http://p.sf.net/sfu/splunk-d2d-c2
>>>>> _______________________________________________
>>>>> Rails-devel mailing list
>>>>> Rai...@li...
>>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>>>
>>>>
>>>> ------------------------------------------------------------------------------
>>>> All of the data generated in your IT infrastructure is seriously valuable.
>>>> Why? It contains a definitive record of application performance, security
>>>> threats, fraudulent activity, and more. Splunk takes this data and makes
>>>> sense of it. IT sense. And common sense.
>>>> http://p.sf.net/sfu/splunk-d2d-c2
>>>> _______________________________________________
>>>> Rails-devel mailing list
>>>> Rai...@li...
>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> All of the data generated in your IT infrastructure is seriously valuable.
>>> Why? It contains a definitive record of application performance, security
>>> threats, fraudulent activity, and more. Splunk takes this data and makes
>>> sense of it. IT sense. And common sense.
>>> http://p.sf.net/sfu/splunk-d2d-c2
>>> _______________________________________________
>>> Rails-devel mailing list
>>> Rai...@li...
>>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>>
>>
>> ------------------------------------------------------------------------------
>> AppSumo Presents a FREE Video for the SourceForge Community by Eric
>> Ries, the creator of the Lean Startup Methodology on "Lean Startup
>> Secrets Revealed." This video shows you how to validate your ideas,
>> optimize your ideas and identify your business strategy.
>> http://p.sf.net/sfu/appsumosfdev2dev
>> _______________________________________________
>> Rails-devel mailing list
>> Rai...@li...
>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>
> ------------------------------------------------------------------------------
> AppSumo Presents a FREE Video for the SourceForge Community by Eric
> Ries, the creator of the Lean Startup Methodology on "Lean Startup
> Secrets Revealed." This video shows you how to validate your ideas,
> optimize your ideas and identify your business strategy.
> http://p.sf.net/sfu/appsumosfdev2dev
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>