Menu
▾
▴
rails-devel
|
From: Erik V. <eri...@xs...> - 2011-07-23 16:37:58
|
This is a “git” patch, and for some reason this patch does not behave correctly when I’m trying to apply it via Eclipse/Egit:
diff --git a/data/1880/CompanyManager.xml b/data/1880/CompanyManager.xml
index c02e2d2..cd8dc10 100644
--- a/data/1880/CompanyManager.xml
+++ b/data/1880/CompanyManager.xml
… etc.
It creates a subdirectory ‘a’ under the project root, and that’s not correct.
Yesterday I tried the same thing to apply some earlier work of myself to the new repo master, and it failed similarly.
Does anyone know how to deal with patches in Git/Egit?
Perhaps we should use “normal” patches (that don’t have these a/ and b/ prefixes)?
What are “git” patches useful for at all?
Erik.
From: Dr....@t-... [mailto:Dr....@t-...]
Sent: Saturday, July 23, 2011 5:09 PM
To: Rails Development
Subject: [Rails-devel] 1880 Patch
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
|
|
From: Stefan F. <ste...@we...> - 2011-07-23 17:13:45
|
Erik & Martin, just by chance I came upon this looking for other things: Inside this tutorial: http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html Take a look at the paragraph Creating Patch: It states that egit cannot import the git patch format. One has to use either a command line tool (do not ask which one) or should stay with the normal default diff-patch. The diff-patch format can be selected in the create patch dialog by NOT selecting the git patch format. However a patch can only contain exactly one commit, thus for several commits the commits have to be bundled using rebase before creating the patch. Stefan On Saturday, July 23, 2011 06:37:52 pm Erik Vos wrote: > This is a “git” patch, and for some reason this patch does not behave > correctly when I’m trying to apply it via Eclipse/Egit: > > > > diff --git a/data/1880/CompanyManager.xml b/data/1880/CompanyManager.xml > > index c02e2d2..cd8dc10 100644 > > --- a/data/1880/CompanyManager.xml > > +++ b/data/1880/CompanyManager.xml > > … etc. > > > > It creates a subdirectory ‘a’ under the project root, and that’s not > correct. > > > > Yesterday I tried the same thing to apply some earlier work of myself to > the new repo master, and it failed similarly. > > > > Does anyone know how to deal with patches in Git/Egit? > > Perhaps we should use “normal” patches (that don’t have these a/ and b/ > prefixes)? > > What are “git” patches useful for at all? > > > > Erik. > > > > > > > > From: Dr....@t-... [mailto:Dr....@t-...] > Sent: Saturday, July 23, 2011 5:09 PM > To: Rails Development > Subject: [Rails-devel] 1880 Patch > > > > 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 |
|
From: brett l. <bre...@gm...> - 2011-07-23 18:16:47
|
I'll add that for any patches you send to the list, please send them in "git diff" format. I can apply them and am familiar with how git deals with them. Also, they're simply more readable. It makes it easier to see what is changing. ---Brett. On Sat, Jul 23, 2011 at 10:15 AM, Stefan Frey <ste...@we...> wrote: > Erik & Martin, > just by chance I came upon this looking for other things: > > Inside this tutorial: > http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html > > Take a look at the paragraph Creating Patch: > > It states that egit cannot import the git patch format. > One has to use either a command line tool (do not ask which one) > or should stay with the normal default diff-patch. > > The diff-patch format can be selected in the create patch dialog by NOT > selecting the git patch format. > > However a patch can only contain exactly one commit, thus for several commits > the commits have to be bundled using rebase before creating the patch. > > Stefan > > > On Saturday, July 23, 2011 06:37:52 pm Erik Vos wrote: >> This is a “git” patch, and for some reason this patch does not behave >> correctly when I’m trying to apply it via Eclipse/Egit: >> >> >> >> diff --git a/data/1880/CompanyManager.xml b/data/1880/CompanyManager.xml >> >> index c02e2d2..cd8dc10 100644 >> >> --- a/data/1880/CompanyManager.xml >> >> +++ b/data/1880/CompanyManager.xml >> >> … etc. >> >> >> >> It creates a subdirectory ‘a’ under the project root, and that’s not >> correct. >> >> >> >> Yesterday I tried the same thing to apply some earlier work of myself to >> the new repo master, and it failed similarly. >> >> >> >> Does anyone know how to deal with patches in Git/Egit? >> >> Perhaps we should use “normal” patches (that don’t have these a/ and b/ >> prefixes)? >> >> What are “git” patches useful for at all? >> >> >> >> Erik. >> >> >> >> >> >> >> >> From: Dr....@t-... [mailto:Dr....@t-...] >> Sent: Saturday, July 23, 2011 5:09 PM >> To: Rails Development >> Subject: [Rails-devel] 1880 Patch >> >> >> >> 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 > |
|
From: Erik V. <eri...@xs...> - 2011-07-23 19:28:09
|
Yes, I had noticed the different patch formats, but overlooked that Egit can't yet handle git patched. Brett, could you then please apply Martin's patch, that he sent today? Erik. > -----Original Message----- > From: Stefan Frey [mailto:ste...@we...] > Sent: Saturday, July 23, 2011 7:16 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] 1880 Patch > > Erik & Martin, > just by chance I came upon this looking for other things: > > Inside this tutorial: > http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html > > Take a look at the paragraph Creating Patch: > > It states that egit cannot import the git patch format. > One has to use either a command line tool (do not ask which one) or should > stay with the normal default diff-patch. > > The diff-patch format can be selected in the create patch dialog by NOT > selecting the git patch format. > > However a patch can only contain exactly one commit, thus for several > commits the commits have to be bundled using rebase before creating the > patch. > > Stefan > > > On Saturday, July 23, 2011 06:37:52 pm Erik Vos wrote: > > This is a “git” patch, and for some reason this patch does not behave > > correctly when I’m trying to apply it via Eclipse/Egit: > > > > > > > > diff --git a/data/1880/CompanyManager.xml > > b/data/1880/CompanyManager.xml > > > > index c02e2d2..cd8dc10 100644 > > > > --- a/data/1880/CompanyManager.xml > > > > +++ b/data/1880/CompanyManager.xml > > > > … etc. > > > > > > > > It creates a subdirectory ‘a’ under the project root, and that’s not > > correct. > > > > > > > > Yesterday I tried the same thing to apply some earlier work of myself > > to the new repo master, and it failed similarly. > > > > > > > > Does anyone know how to deal with patches in Git/Egit? > > > > Perhaps we should use “normal” patches (that don’t have these a/ and > > b/ prefixes)? > > > > What are “git” patches useful for at all? > > > > > > > > Erik. > > > > > > > > > > > > > > > > From: Dr....@t-... [mailto:Dr.Martin.Brumm@t- > online.de] > > Sent: Saturday, July 23, 2011 5:09 PM > > To: Rails Development > > Subject: [Rails-devel] 1880 Patch > > > > > > > > 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 |
|
From: brett l. <bre...@gm...> - 2011-07-23 19:44:04
|
Of course. :-) ---Brett. On Sat, Jul 23, 2011 at 12:28 PM, Erik Vos <eri...@xs...> wrote: > Yes, I had noticed the different patch formats, but overlooked that Egit can't yet handle git patched. > > Brett, could you then please apply Martin's patch, that he sent today? > > Erik. > >> -----Original Message----- >> From: Stefan Frey [mailto:ste...@we...] >> Sent: Saturday, July 23, 2011 7:16 PM >> To: Development list for Rails: an 18xx game >> Subject: Re: [Rails-devel] 1880 Patch >> >> Erik & Martin, >> just by chance I came upon this looking for other things: >> >> Inside this tutorial: >> http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html >> >> Take a look at the paragraph Creating Patch: >> >> It states that egit cannot import the git patch format. >> One has to use either a command line tool (do not ask which one) or should >> stay with the normal default diff-patch. >> >> The diff-patch format can be selected in the create patch dialog by NOT >> selecting the git patch format. >> >> However a patch can only contain exactly one commit, thus for several >> commits the commits have to be bundled using rebase before creating the >> patch. >> >> Stefan >> >> >> On Saturday, July 23, 2011 06:37:52 pm Erik Vos wrote: >> > This is a “git” patch, and for some reason this patch does not behave >> > correctly when I’m trying to apply it via Eclipse/Egit: >> > >> > >> > >> > diff --git a/data/1880/CompanyManager.xml >> > b/data/1880/CompanyManager.xml >> > >> > index c02e2d2..cd8dc10 100644 >> > >> > --- a/data/1880/CompanyManager.xml >> > >> > +++ b/data/1880/CompanyManager.xml >> > >> > … etc. >> > >> > >> > >> > It creates a subdirectory ‘a’ under the project root, and that’s not >> > correct. >> > >> > >> > >> > Yesterday I tried the same thing to apply some earlier work of myself >> > to the new repo master, and it failed similarly. >> > >> > >> > >> > Does anyone know how to deal with patches in Git/Egit? >> > >> > Perhaps we should use “normal” patches (that don’t have these a/ and >> > b/ prefixes)? >> > >> > What are “git” patches useful for at all? >> > >> > >> > >> > Erik. >> > >> > >> > >> > >> > >> > >> > >> > From: Dr....@t-... [mailto:Dr.Martin.Brumm@t- >> online.de] >> > Sent: Saturday, July 23, 2011 5:09 PM >> > To: Rails Development >> > Subject: [Rails-devel] 1880 Patch >> > >> > >> > >> > 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 > > > ------------------------------------------------------------------------------ > 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 > |
|
From: brett l. <bre...@gm...> - 2011-07-23 19:48:44
|
Oh... One further note about Git patches: I'm not sure if EGit does this, but I know that "git format-patch" does... It creates patches with header information about the patch. If this header information is retained, it allows the patch to be applied with correct attribution to the original author. I'm a big fan of making sure proper credit and ownership of work is being given. Keeping that header information on your patches helps me do that. :-) ---Brett. On Sat, Jul 23, 2011 at 12:43 PM, brett lentz <bre...@gm...> wrote: > Of course. :-) > > ---Brett. > > > > On Sat, Jul 23, 2011 at 12:28 PM, Erik Vos <eri...@xs...> wrote: >> Yes, I had noticed the different patch formats, but overlooked that Egit can't yet handle git patched. >> >> Brett, could you then please apply Martin's patch, that he sent today? >> >> Erik. >> >>> -----Original Message----- >>> From: Stefan Frey [mailto:ste...@we...] >>> Sent: Saturday, July 23, 2011 7:16 PM >>> To: Development list for Rails: an 18xx game >>> Subject: Re: [Rails-devel] 1880 Patch >>> >>> Erik & Martin, >>> just by chance I came upon this looking for other things: >>> >>> Inside this tutorial: >>> http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html >>> >>> Take a look at the paragraph Creating Patch: >>> >>> It states that egit cannot import the git patch format. >>> One has to use either a command line tool (do not ask which one) or should >>> stay with the normal default diff-patch. >>> >>> The diff-patch format can be selected in the create patch dialog by NOT >>> selecting the git patch format. >>> >>> However a patch can only contain exactly one commit, thus for several >>> commits the commits have to be bundled using rebase before creating the >>> patch. >>> >>> Stefan >>> >>> >>> On Saturday, July 23, 2011 06:37:52 pm Erik Vos wrote: >>> > This is a “git” patch, and for some reason this patch does not behave >>> > correctly when I’m trying to apply it via Eclipse/Egit: >>> > >>> > >>> > >>> > diff --git a/data/1880/CompanyManager.xml >>> > b/data/1880/CompanyManager.xml >>> > >>> > index c02e2d2..cd8dc10 100644 >>> > >>> > --- a/data/1880/CompanyManager.xml >>> > >>> > +++ b/data/1880/CompanyManager.xml >>> > >>> > … etc. >>> > >>> > >>> > >>> > It creates a subdirectory ‘a’ under the project root, and that’s not >>> > correct. >>> > >>> > >>> > >>> > Yesterday I tried the same thing to apply some earlier work of myself >>> > to the new repo master, and it failed similarly. >>> > >>> > >>> > >>> > Does anyone know how to deal with patches in Git/Egit? >>> > >>> > Perhaps we should use “normal” patches (that don’t have these a/ and >>> > b/ prefixes)? >>> > >>> > What are “git” patches useful for at all? >>> > >>> > >>> > >>> > Erik. >>> > >>> > >>> > >>> > >>> > >>> > >>> > >>> > From: Dr....@t-... [mailto:Dr.Martin.Brumm@t- >>> online.de] >>> > Sent: Saturday, July 23, 2011 5:09 PM >>> > To: Rails Development >>> > Subject: [Rails-devel] 1880 Patch >>> > >>> > >>> > >>> > 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 >> >> >> ------------------------------------------------------------------------------ >> 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 >> > |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X