Re: Patch and svk mirror depot
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 actually there is more that is covered in the link I provided. Bruno Busco sent the following on 1/18/2009 1:12 PM: > The patch must be in SVN format _AND_ obtained from an SVN working directory > that has been checked out from the Apache repo. > I suggest you not to spend time in changing the format manually. > > When a committer will try to apply the patch will always get into troubles > if you will not follow this procedure. > > -Bruno > > 2009/1/18 BJ Freeman > > not a problem > if you want to submit, it must be in SVN format. > you may have to manually massage it. > > Eric DE MAULDE sent the following on 1/18/2009 12:48 PM: >>>> Thanks everybody >>>> >>>> The problem : >>>> >>>> "SVK diff" doesn't write the same path system than "SVN diff" , why ? >>>> >>>> * Example with "SVK diff" >>>> >>>> === ProductConfigWrapper.java >>>> == >>>> --- ProductConfigWrapper.java >>>> > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>> (revision 7214) >>>> +++ ProductConfigWrapper.java >>>> > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>> (revision 7214) >>>> @@ -57,6 +57,7 @@ >>>> ... >>>> >>>> --- >>>> *** Example with "SVN diff" *** >>>> >>>> >>>> === ProductConfigWrapper.java >>>> == >>>> --- >>>> > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>> (revision 7214) >>>> +++ >>>> > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>> (revision 7214) >>>> @@ -57,6 +57,7 @@ >>>> ... >>>> >>>> Eric >>>> >>>> >>>> - Original Message - From: "BJ Freeman" >>>> To: >>>> Sent: Sunday, January 18, 2009 9:38 PM >>>> Subject: Re: Patch and svk mirror depot >>>> >>>> >>>> http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices >>>> >>>> Eric DE MAULDE sent the following on 1/18/2009 3:31 AM: >>>>>>> Hi, >>>>>>> >>>>>>> I have a Debian server with a mirror of the OFBiz trunk >>>>>>> SVK is my version control >>>>>>> My mirror depot path is //mirror/VendorOfbiz/trunk >>>>>>> My local depot path is //local/customOfbiz/trunk >>>>>>> >>>>>>> When I implemented this version control solution, I didn't think of >>>>>>> patching >>>>>>> >>>>>>> If I create a patch, I type : >>>>>>> >>>>>>> svk diff >>>>>>> > //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>>>>> > //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>>>>>> ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch >>>>>>> And I have to modify my patch file to rewrite the path >>>>>>> from : >>>>>>> >>>>>>> --- ProductConfigWrapper.java >>>>>>> > (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>>>>> (revision 7214) >>>>>>> >>>>>>> to : >>>>>>> >>>>>>> --- ProductConfigWrapper.java >>>>>>> > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>>>>> (revision 7214) >>>>>>> >>>>>>> When I have several modified files, I manually create my main patch >>>>>>> adding each patch ( because I have another changes into a >>>>>>> sub-directory). >>>>>>> >>>>>>> Committers tell me : >>>>>>> >>>>>>> * I guess you use a local repository because you have a revision 7215 >>>>>>> number >>>>>>> * I don't know how you generated your patch but I get this error >>>>>>> D:\workspace\ofbizRun>patch -p0 0>>>>>> can't find file to patch at input line 5 >>>>>>> Perhaps you used the wrong -p or --strip option? >>>>>>> The text leading up to this was: >>>>>>> -- >>>>>>> |´??=== entitymodel.xml >>>>>>> |== >>>>>>> |--- entitymodel.xml >>>>>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) >>>>>>> |+++ entitymodel.xml >>>>>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) >>>>>>> >>>>>>> >>>>>>> Do you have a solution ? >>>>>>> Have I to delete my mirror to direct update from the official OFBiz >>>>>>> trunk ? >>>>>>> >>>>>>> Thank you very much in advance >>>>>>> >>>>>>> >>>>>>> Eric >> -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJc5+irP3NbaWWqE4RAovaAKDJmF4aL1v30iGdAniHboga+3Q9WwCeIf+S oNwf/sZJUKboGHTG19yTV9Q= =SW2F -END PGP SIGNATURE-
Re: Patch and svk mirror depot
The patch must be in SVN format _AND_ obtained from an SVN working directory that has been checked out from the Apache repo. I suggest you not to spend time in changing the format manually. When a committer will try to apply the patch will always get into troubles if you will not follow this procedure. -Bruno 2009/1/18 BJ Freeman > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > not a problem > if you want to submit, it must be in SVN format. > you may have to manually massage it. > > Eric DE MAULDE sent the following on 1/18/2009 12:48 PM: > > Thanks everybody > > > > The problem : > > > > "SVK diff" doesn't write the same path system than "SVN diff" , why ? > > > > * Example with "SVK diff" > > > > === ProductConfigWrapper.java > > == > > --- ProductConfigWrapper.java > > > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > > (revision 7214) > > +++ ProductConfigWrapper.java > > > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > > (revision 7214) > > @@ -57,6 +57,7 @@ > > ... > > > > --- > > *** Example with "SVN diff" *** > > > > > > === ProductConfigWrapper.java > > == > > --- > > > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > > (revision 7214) > > +++ > > > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > > (revision 7214) > > @@ -57,6 +57,7 @@ > > ... > > > > Eric > > > > > > - Original Message - From: "BJ Freeman" > > To: > > Sent: Sunday, January 18, 2009 9:38 PM > > Subject: Re: Patch and svk mirror depot > > > > > > http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices > > > > Eric DE MAULDE sent the following on 1/18/2009 3:31 AM: > >>>> Hi, > >>>> > >>>> I have a Debian server with a mirror of the OFBiz trunk > >>>> SVK is my version control > >>>> My mirror depot path is //mirror/VendorOfbiz/trunk > >>>> My local depot path is //local/customOfbiz/trunk > >>>> > >>>> When I implemented this version control solution, I didn't think of > >>>> patching > >>>> > >>>> If I create a patch, I type : > >>>> > >>>> svk diff > >>>> > //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > >>>> > >>>> > //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > >>>> > >>>>> ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch > >>>> > >>>> And I have to modify my patch file to rewrite the path > >>>> from : > >>>> > >>>> --- ProductConfigWrapper.java > >>>> > (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > >>>> (revision 7214) > >>>> > >>>> to : > >>>> > >>>> --- ProductConfigWrapper.java > >>>> > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > >>>> (revision 7214) > >>>> > >>>> When I have several modified files, I manually create my main patch > >>>> adding each patch ( because I have another changes into a > >>>> sub-directory). > >>>> > >>>> Committers tell me : > >>>> > >>>> * I guess you use a local repository because you have a revision 7215 > >>>> number > >>>> * I don't know how you generated your patch but I get this error > >>>> D:\workspace\ofbizRun>patch -p0 0 >>>> can't find file to patch at input line 5 > >>>> Perhaps you used the wrong -p or --strip option? > >>>> The text leading up to this was: > >>>> -- > >>>> |´??=== entitymodel.xml > >>>> |== > >>>> |--- entitymodel.xml > >>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) > >>>> |+++ entitymodel.xml > >>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) > >>>> > >>>> > >>>> Do you have a solution ? > >>>> Have I to delete my mirror to direct update from the official OFBiz > >>>> trunk ? > >>>> > >>>> Thank you very much in advance > >>>> > >>>> > >>>> Eric > >> > > -BEGIN PGP SIGNATURE- > Version: GnuPG v1.4.6 (MingW32) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > > iD8DBQFJc5dMrP3NbaWWqE4RAiQvAJ9Amz9GRPbkbIPfGxsaob4m9z5uWACcDwU3 > byXaN+eKdSB/e9+BzTcYYL4= > =kxdj > -END PGP SIGNATURE- >
Re: Patch and svk mirror depot
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 not a problem if you want to submit, it must be in SVN format. you may have to manually massage it. Eric DE MAULDE sent the following on 1/18/2009 12:48 PM: > Thanks everybody > > The problem : > > "SVK diff" doesn't write the same path system than "SVN diff" , why ? > > * Example with "SVK diff" > > === ProductConfigWrapper.java > == > --- ProductConfigWrapper.java > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > +++ ProductConfigWrapper.java > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > @@ -57,6 +57,7 @@ > ... > > --- > *** Example with "SVN diff" *** > > > === ProductConfigWrapper.java > == > --- > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > (revision 7214) > +++ > applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > (revision 7214) > @@ -57,6 +57,7 @@ > ... > > Eric > > > - Original Message - From: "BJ Freeman" > To: > Sent: Sunday, January 18, 2009 9:38 PM > Subject: Re: Patch and svk mirror depot > > > http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices > > Eric DE MAULDE sent the following on 1/18/2009 3:31 AM: >>>> Hi, >>>> >>>> I have a Debian server with a mirror of the OFBiz trunk >>>> SVK is my version control >>>> My mirror depot path is //mirror/VendorOfbiz/trunk >>>> My local depot path is //local/customOfbiz/trunk >>>> >>>> When I implemented this version control solution, I didn't think of >>>> patching >>>> >>>> If I create a patch, I type : >>>> >>>> svk diff >>>> //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>> >>>> //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >>>> >>>>> ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch >>>> >>>> And I have to modify my patch file to rewrite the path >>>> from : >>>> >>>> --- ProductConfigWrapper.java >>>> (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>> (revision 7214) >>>> >>>> to : >>>> >>>> --- ProductConfigWrapper.java >>>> (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) >>>> (revision 7214) >>>> >>>> When I have several modified files, I manually create my main patch >>>> adding each patch ( because I have another changes into a >>>> sub-directory). >>>> >>>> Committers tell me : >>>> >>>> * I guess you use a local repository because you have a revision 7215 >>>> number >>>> * I don't know how you generated your patch but I get this error >>>> D:\workspace\ofbizRun>patch -p0 0>>> can't find file to patch at input line 5 >>>> Perhaps you used the wrong -p or --strip option? >>>> The text leading up to this was: >>>> -- >>>> |´??=== entitymodel.xml >>>> |== >>>> |--- entitymodel.xml >>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) >>>> |+++ entitymodel.xml >>>> (applications/product/entitydef/entitymodel.xml) (revision 7215) >>>> >>>> >>>> Do you have a solution ? >>>> Have I to delete my mirror to direct update from the official OFBiz >>>> trunk ? >>>> >>>> Thank you very much in advance >>>> >>>> >>>> Eric >> -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJc5dMrP3NbaWWqE4RAiQvAJ9Amz9GRPbkbIPfGxsaob4m9z5uWACcDwU3 byXaN+eKdSB/e9+BzTcYYL4= =kxdj -END PGP SIGNATURE-
Re: Patch and svk mirror depot
Thanks everybody The problem : "SVK diff" doesn't write the same path system than "SVN diff" , why ? * Example with "SVK diff" === ProductConfigWrapper.java == --- ProductConfigWrapper.java (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214) +++ ProductConfigWrapper.java (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214) @@ -57,6 +57,7 @@ ... --- *** Example with "SVN diff" *** === ProductConfigWrapper.java == --- applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (revision 7214) +++ applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (revision 7214) @@ -57,6 +57,7 @@ ... Eric - Original Message - From: "BJ Freeman" To: Sent: Sunday, January 18, 2009 9:38 PM Subject: Re: Patch and svk mirror depot -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices Eric DE MAULDE sent the following on 1/18/2009 3:31 AM: Hi, I have a Debian server with a mirror of the OFBiz trunk SVK is my version control My mirror depot path is //mirror/VendorOfbiz/trunk My local depot path is //local/customOfbiz/trunk When I implemented this version control solution, I didn't think of patching If I create a patch, I type : svk diff //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch And I have to modify my patch file to rewrite the path from : --- ProductConfigWrapper.java (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214) to : --- ProductConfigWrapper.java (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) (revision 7214) When I have several modified files, I manually create my main patch adding each patch ( because I have another changes into a sub-directory). Committers tell me : * I guess you use a local repository because you have a revision 7215 number * I don't know how you generated your patch but I get this error D:\workspace\ofbizRun>patch -p0 0|--- entitymodel.xml(applications/product/entitydef/entitymodel.xml) (revision 7215) |+++ entitymodel.xml(applications/product/entitydef/entitymodel.xml) (revision 7215) Do you have a solution ? Have I to delete my mirror to direct update from the official OFBiz trunk ? Thank you very much in advance Eric -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJc5MwrP3NbaWWqE4RAm1hAJ9qEUD/jqermij6e1Tvxc9QzOFmzQCgqBpN a0Nwl80XC8zjpxviDq7Xugc= =OiD9 -END PGP SIGNATURE-
Re: Patch and svk mirror depot
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices Eric DE MAULDE sent the following on 1/18/2009 3:31 AM: > Hi, > > I have a Debian server with a mirror of the OFBiz trunk > SVK is my version control > My mirror depot path is //mirror/VendorOfbiz/trunk > My local depot path is //local/customOfbiz/trunk > > When I implemented this version control solution, I didn't think of patching > > If I create a patch, I type : > > svk diff > //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >> ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch > > And I have to modify my patch file to rewrite the path > from : > > --- ProductConfigWrapper.java > (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > > to : > > --- ProductConfigWrapper.java > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > > When I have several modified files, I manually create my main patch adding > each patch ( because I have another changes into a sub-directory). > > Committers tell me : > > * I guess you use a local repository because you have a revision 7215 number > * I don't know how you generated your patch but I get this error > D:\workspace\ofbizRun>patch -p0 0 can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -- > |´??=== entitymodel.xml > |== > |--- entitymodel.xml(applications/product/entitydef/entitymodel.xml) > (revision 7215) > |+++ entitymodel.xml(applications/product/entitydef/entitymodel.xml) > (revision 7215) > > > Do you have a solution ? > Have I to delete my mirror to direct update from the official OFBiz trunk ? > > Thank you very much in advance > > > Eric -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJc5MwrP3NbaWWqE4RAm1hAJ9qEUD/jqermij6e1Tvxc9QzOFmzQCgqBpN a0Nwl80XC8zjpxviDq7Xugc= =OiD9 -END PGP SIGNATURE-
Re: Patch and svk mirror depot
Eric, in order to submit committable patches you definitively need to have an SVN working directory checked out from the Apache repository. You can have whatever revision control for your own but at the end, when you whant to submit a patch, you need to: 1) update your SVN apache ofbiz working directory 2) copy your changes to it 3) run the svn diff command and submit the patch you get. Hope this helps, Bruno 2009/1/18 Eric DE MAULDE > Hi, > > I have a Debian server with a mirror of the OFBiz trunk > SVK is my version control > My mirror depot path is //mirror/VendorOfbiz/trunk > My local depot path is //local/customOfbiz/trunk > > When I implemented this version control solution, I didn't think of > patching > > If I create a patch, I type : > > svk diff > //mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > > //local/customOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > > ./Patch/getTotalListPrice_ProductConfigWrapper.java.patch > > And I have to modify my patch file to rewrite the path > from : > > --- ProductConfigWrapper.java > (/mirror/vendorOfbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > > to : > > --- ProductConfigWrapper.java > (applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java) > (revision 7214) > > When I have several modified files, I manually create my main patch adding > each patch ( because I have another changes into a sub-directory). > > Committers tell me : > > * I guess you use a local repository because you have a revision 7215 > number > * I don't know how you generated your patch but I get this error > D:\workspace\ofbizRun>patch -p0 0 can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -- > |´??=== entitymodel.xml > |== > |--- entitymodel.xml(applications/product/entitydef/entitymodel.xml) > (revision 7215) > |+++ entitymodel.xml(applications/product/entitydef/entitymodel.xml) > (revision 7215) > > > Do you have a solution ? > Have I to delete my mirror to direct update from the official OFBiz trunk ? > > Thank you very much in advance > > > Eric
