Re: [Rails-devel] 1880 Patch

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

Patch applied.

I needed to convert a bunch of XML files from dos formatting to unix
formatting before it applied cleanly, so that conversion has also been
committed.

---Brett.



On Sat, Jul 23, 2011 at 8:08 AM, Dr....@t-...
<Dr....@t-...> wrote:
>  hi all,
>
>
>
> after having a heck of problems with eclipse and [e,j]git i managed to
> untangle the knot with the external git implementation...
>
>
>
>>>>>
>
>     Added changes to the map, introducing the tiles -4008 and -4009 for
>     the water connections (ferries).
>
>     Altered the stockmarket display according to other examples with
>     colored names for the additional revenue hexes.
>
>     Revised the Trains and Phase mechanismns according to the recent
>     changes done to 1835.
>
>
>
> <<<<<
>
>
>
> And yes i'll keep tying to find out why i cant update the local clone from
> the remote master and make a simple patch file in eclipse from my working
> branch against an updated local clone...
>
>
>
> Workflow as intended:
>
>
>
> Cloned the remote origin into remote/master (local working clone)
>
> branched my 1880-devel-branch of the remote/master  (local working clone)
>
> edit files
>
> commit against 1880 devel branch (so far everything was okay...)
>
> updating local working clone via pull/fetch from remote origin (shouldnt
> overwrite 1880 branch) (didnt work, couldnt get an updated history view of
> remote/master that was consistent with the history of remote/origin)
>
> check for conflicts between 1880 devel branch (.....)
>
> draw patch of 1880 devel branch against remote master
>
>
>
> from here on i choose to merge the 1880 branch with my remote master (that
> of course in the external git was somehow aligned with the remote/origin...)
> in the external git and draw a patch against the last state of the remote
> origin/master...
>
> branched a new development branch.(current state of confusion :))
>
>
>
> I wasnt able to create a small an simple patch from the egit/jgit inside
> eclipse it created a monster patch over all files even though i had only
> changed those 6. Probably something to do with the windows/unix CRLF/LF
> problematic...
>
>
>
> And yes i if anybody has some advice dont hesitate even if it makes me look
> like stupid :)
>
>
>
> Regards Martin
>
>
>
>
>
>
>
> ------------------------------------------------------------------------------
> Storage Efficiency Calculator
> This modeling tool is based on patent-pending intellectual property that
> has been used successfully in hundreds of IBM storage optimization engage-
> ments, worldwide.  Store less, Store more with what you own, Move data to
> the right place. Try It Now!
> http://www.accelacomm.com/jaw/sfnl/114/51427378/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>