SVN - vendor branch
Locked
 
|
Hi,
I am looking at http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branch and have a question. In the section "Import Apache OFBiz for the first time and create the customofbiz project" there is the following tip: /Tip: the .svnversion/conf file should be equal to the standard ofbiz file except for the svn:keywords properties that should be completely removed to avoid merging problems later on /Can someone please explain this to me, I really dont want to screw up my repository from the start. Where is "/svnversion/conf/", what is the "standard ofbiz file" and where are the svn:keywords properties? Thank you Cheers Grant Edwards / / |
|
|
The standard ofbiz config file is here : http://ofbiz.apache.org/svn/config
The config file on your local machine can searched on the "Home folder" of the "User" after enabling the feature to see the hidden files. There is a folder .subversion and config file exists inside it. Suppose I work by user ashish on my Linux box. So config file on my local machine will be available at /home/ashish/.subversion/config. I am not sure about the merging thing because I didn't play with it. Somebody can help you on this. -- Ashish On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards <[hidden email]> wrote: > Hi, > > I am looking at > http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchand have a question. > > In the section "Import Apache OFBiz for the first time and create the > customofbiz project" there is the following tip: > > /Tip: the .svnversion/conf file should be equal to the standard ofbiz file > except for the svn:keywords properties that should be completely removed to > avoid merging problems later on > > > /Can someone please explain this to me, I really dont want to screw up my > repository from the start. Where is "/svnversion/conf/", what is the > "standard ofbiz file" and where are the svn:keywords properties? > > Thank you > > Cheers > > Grant Edwards > / > / > |
|
|
Thank you Ashish, at least now I have the correct config file.
Now reading that tip again it states "svn:keywords properties that should be completely removed ...". Was the author of this tip, meaning change this: [auto-props] *.java = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.bsh = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.groovy = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.jsp = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.tld = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" to this: [auto-props] *.java = svn:mime-type=text/plain;svn:eol-style=native *.bsh = svn:mime-type=text/plain;svn:eol-style=native *.groovy = svn:mime-type=text/plain;svn:eol-style=native *.jsp = svn:mime-type=text/plain;svn:eol-style=native *.tld = svn:mime-type=text/xml;svn:eol-style=native Kind regards Grant Edwards Ashish Vijaywargiya wrote: > The standard ofbiz config file is here : http://ofbiz.apache.org/svn/config > The config file on your local machine can searched on the "Home folder" of > the "User" after enabling the feature to see the hidden files. > There is a folder .subversion and config file exists inside it. > > Suppose I work by user ashish on my Linux box. > So config file on my local machine will be available at > /home/ashish/.subversion/config. > > > I am not sure about the merging thing because I didn't play with it. > Somebody can help you on this. > > > -- > Ashish > > > On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards <[hidden email]> > wrote: > > >> Hi, >> >> I am looking at >> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchand have a question. >> >> In the section "Import Apache OFBiz for the first time and create the >> customofbiz project" there is the following tip: >> >> /Tip: the .svnversion/conf file should be equal to the standard ofbiz file >> except for the svn:keywords properties that should be completely removed to >> avoid merging problems later on >> >> >> /Can someone please explain this to me, I really dont want to screw up my >> repository from the start. Where is "/svnversion/conf/", what is the >> "standard ofbiz file" and where are the svn:keywords properties? >> >> Thank you >> >> Cheers >> >> Grant Edwards >> / >> / >> >> > > |
|
|
Yes you are right.
On my local machine I replaced my config file from the file that come-up for Ofbiz one i.e http://ofbiz.apache.org/svn/config. -- Ashish On Wed, Jun 11, 2008 at 9:35 AM, Grant Edwards <[hidden email]> wrote: > Thank you Ashish, at least now I have the correct config file. > > Now reading that tip again it states "svn:keywords properties that should > be completely removed ...". > > Was the author of this tip, meaning change this: > > [auto-props] > *.java = > svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author > URL Id" > *.bsh = > svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author > URL Id" > *.groovy = > svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author > URL Id" > *.jsp = > svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author > URL Id" > *.tld = > svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev Author > URL Id" > > > to this: > > [auto-props] > *.java = svn:mime-type=text/plain;svn:eol-style=native > *.bsh = svn:mime-type=text/plain;svn:eol-style=native > *.groovy = svn:mime-type=text/plain;svn:eol-style=native > *.jsp = svn:mime-type=text/plain;svn:eol-style=native > *.tld = svn:mime-type=text/xml;svn:eol-style=native > > > Kind regards > > Grant Edwards > > > > Ashish Vijaywargiya wrote: > >> The standard ofbiz config file is here : >> http://ofbiz.apache.org/svn/config >> The config file on your local machine can searched on the "Home folder" of >> the "User" after enabling the feature to see the hidden files. >> There is a folder .subversion and config file exists inside it. >> >> Suppose I work by user ashish on my Linux box. >> So config file on my local machine will be available at >> /home/ashish/.subversion/config. >> >> >> I am not sure about the merging thing because I didn't play with it. >> Somebody can help you on this. >> >> >> -- >> Ashish >> >> >> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards < >> [hidden email]> >> wrote: >> >> >> >>> Hi, >>> >>> I am looking at >>> >>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchandhave a question. >>> >>> In the section "Import Apache OFBiz for the first time and create the >>> customofbiz project" there is the following tip: >>> >>> /Tip: the .svnversion/conf file should be equal to the standard ofbiz >>> file >>> except for the svn:keywords properties that should be completely removed >>> to >>> avoid merging problems later on >>> >>> >>> /Can someone please explain this to me, I really dont want to screw up my >>> repository from the start. Where is "/svnversion/conf/", what is the >>> "standard ofbiz file" and where are the svn:keywords properties? >>> >>> Thank you >>> >>> Cheers >>> >>> Grant Edwards >>> / >>> / >>> >>> >>> >> >> >> > |
|
|
In reply to this post by Grant Edwards-2
Hi Grant,
the tip in that page is no more really required because since then we have removed all the keywords from the OFBiz source files. Jacopo On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: > Thank you Ashish, at least now I have the correct config file. > > Now reading that tip again it states "svn:keywords properties that > should be completely removed ...". > > Was the author of this tip, meaning change this: > > [auto-props] > *.java = svn:mime-type=text/plain;svn:eol- > style=native;svn:keywords="Date Rev Author URL Id" > *.bsh = svn:mime-type=text/plain;svn:eol- > style=native;svn:keywords="Date Rev Author URL Id" > *.groovy = svn:mime-type=text/plain;svn:eol- > style=native;svn:keywords="Date Rev Author URL Id" > *.jsp = svn:mime-type=text/plain;svn:eol- > style=native;svn:keywords="Date Rev Author URL Id" > *.tld = svn:mime-type=text/xml;svn:eol- > style=native;svn:keywords="Date Rev Author URL Id" > > > to this: > > [auto-props] > *.java = svn:mime-type=text/plain;svn:eol-style=native > *.bsh = svn:mime-type=text/plain;svn:eol-style=native > *.groovy = svn:mime-type=text/plain;svn:eol-style=native > *.jsp = svn:mime-type=text/plain;svn:eol-style=native > *.tld = svn:mime-type=text/xml;svn:eol-style=native > > > Kind regards > > Grant Edwards > > > > Ashish Vijaywargiya wrote: >> The standard ofbiz config file is here : http://ofbiz.apache.org/svn/config >> The config file on your local machine can searched on the "Home >> folder" of >> the "User" after enabling the feature to see the hidden files. >> There is a folder .subversion and config file exists inside it. >> >> Suppose I work by user ashish on my Linux box. >> So config file on my local machine will be available at >> /home/ashish/.subversion/config. >> >> >> I am not sure about the merging thing because I didn't play with it. >> Somebody can help you on this. >> >> >> -- >> Ashish >> >> >> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards <[hidden email] >> > >> wrote: >> >> >>> Hi, >>> >>> I am looking at >>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchand >>> have a question. >>> >>> In the section "Import Apache OFBiz for the first time and create >>> the >>> customofbiz project" there is the following tip: >>> >>> /Tip: the .svnversion/conf file should be equal to the standard >>> ofbiz file >>> except for the svn:keywords properties that should be completely >>> removed to >>> avoid merging problems later on >>> >>> >>> /Can someone please explain this to me, I really dont want to >>> screw up my >>> repository from the start. Where is "/svnversion/conf/", what is the >>> "standard ofbiz file" and where are the svn:keywords properties? >>> >>> Thank you >>> >>> Cheers >>> >>> Grant Edwards >>> / >>> / >>> >>> >> >> |
|
|
Thanks Jacopo.
Can we get that tip removed from the wiki page ? Grant Jacopo Cappellato wrote: > Hi Grant, > > the tip in that page is no more really required because since then we > have removed all the keywords from the OFBiz source files. > > Jacopo > > On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: > >> Thank you Ashish, at least now I have the correct config file. >> >> Now reading that tip again it states "svn:keywords properties that >> should be completely removed ...". >> >> Was the author of this tip, meaning change this: >> >> [auto-props] >> *.java = >> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >> Author URL Id" >> *.bsh = >> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >> Author URL Id" >> *.groovy = >> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >> Author URL Id" >> *.jsp = >> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >> Author URL Id" >> *.tld = >> svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev >> Author URL Id" >> >> >> to this: >> >> [auto-props] >> *.java = svn:mime-type=text/plain;svn:eol-style=native >> *.bsh = svn:mime-type=text/plain;svn:eol-style=native >> *.groovy = svn:mime-type=text/plain;svn:eol-style=native >> *.jsp = svn:mime-type=text/plain;svn:eol-style=native >> *.tld = svn:mime-type=text/xml;svn:eol-style=native >> >> >> Kind regards >> >> Grant Edwards >> >> >> >> Ashish Vijaywargiya wrote: >>> The standard ofbiz config file is here : >>> http://ofbiz.apache.org/svn/config >>> The config file on your local machine can searched on the "Home >>> folder" of >>> the "User" after enabling the feature to see the hidden files. >>> There is a folder .subversion and config file exists inside it. >>> >>> Suppose I work by user ashish on my Linux box. >>> So config file on my local machine will be available at >>> /home/ashish/.subversion/config. >>> >>> >>> I am not sure about the merging thing because I didn't play with it. >>> Somebody can help you on this. >>> >>> >>> -- >>> Ashish >>> >>> >>> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards >>> <[hidden email]> >>> wrote: >>> >>> >>>> Hi, >>>> >>>> I am looking at >>>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchand have >>>> a question. >>>> >>>> In the section "Import Apache OFBiz for the first time and create the >>>> customofbiz project" there is the following tip: >>>> >>>> /Tip: the .svnversion/conf file should be equal to the standard >>>> ofbiz file >>>> except for the svn:keywords properties that should be completely >>>> removed to >>>> avoid merging problems later on >>>> >>>> >>>> /Can someone please explain this to me, I really dont want to screw >>>> up my >>>> repository from the start. Where is "/svnversion/conf/", what is the >>>> "standard ofbiz file" and where are the svn:keywords properties? >>>> >>>> Thank you >>>> >>>> Cheers >>>> >>>> Grant Edwards >>>> / >>>> / >>>> >>>> >>> >>> > > |
Administrator
|
Done,
Jacques From: "Grant Edwards" <[hidden email]> > Thanks Jacopo. > > Can we get that tip removed from the wiki page ? > > Grant > > Jacopo Cappellato wrote: >> Hi Grant, >> >> the tip in that page is no more really required because since then we >> have removed all the keywords from the OFBiz source files. >> >> Jacopo >> >> On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: >> >>> Thank you Ashish, at least now I have the correct config file. >>> >>> Now reading that tip again it states "svn:keywords properties that >>> should be completely removed ...". >>> >>> Was the author of this tip, meaning change this: >>> >>> [auto-props] >>> *.java = >>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>> Author URL Id" >>> *.bsh = >>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>> Author URL Id" >>> *.groovy = >>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>> Author URL Id" >>> *.jsp = >>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>> Author URL Id" >>> *.tld = >>> svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev >>> Author URL Id" >>> >>> >>> to this: >>> >>> [auto-props] >>> *.java = svn:mime-type=text/plain;svn:eol-style=native >>> *.bsh = svn:mime-type=text/plain;svn:eol-style=native >>> *.groovy = svn:mime-type=text/plain;svn:eol-style=native >>> *.jsp = svn:mime-type=text/plain;svn:eol-style=native >>> *.tld = svn:mime-type=text/xml;svn:eol-style=native >>> >>> >>> Kind regards >>> >>> Grant Edwards >>> >>> >>> >>> Ashish Vijaywargiya wrote: >>>> The standard ofbiz config file is here : >>>> http://ofbiz.apache.org/svn/config >>>> The config file on your local machine can searched on the "Home >>>> folder" of >>>> the "User" after enabling the feature to see the hidden files. >>>> There is a folder .subversion and config file exists inside it. >>>> >>>> Suppose I work by user ashish on my Linux box. >>>> So config file on my local machine will be available at >>>> /home/ashish/.subversion/config. >>>> >>>> >>>> I am not sure about the merging thing because I didn't play with it. >>>> Somebody can help you on this. >>>> >>>> >>>> -- >>>> Ashish >>>> >>>> >>>> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards >>>> <[hidden email]> >>>> wrote: >>>> >>>> >>>>> Hi, >>>>> >>>>> I am looking at >>>>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchand have >>>>> a question. >>>>> >>>>> In the section "Import Apache OFBiz for the first time and create the >>>>> customofbiz project" there is the following tip: >>>>> >>>>> /Tip: the .svnversion/conf file should be equal to the standard >>>>> ofbiz file >>>>> except for the svn:keywords properties that should be completely >>>>> removed to >>>>> avoid merging problems later on >>>>> >>>>> >>>>> /Can someone please explain this to me, I really dont want to screw >>>>> up my >>>>> repository from the start. Where is "/svnversion/conf/", what is the >>>>> "standard ofbiz file" and where are the svn:keywords properties? >>>>> >>>>> Thank you >>>>> >>>>> Cheers >>>>> >>>>> Grant Edwards >>>>> / >>>>> / >>>>> >>>>> >>>> >>>> >> >> > |
|
|
Thanks Jacques :)
-- Ashish On Thu, Jun 12, 2008 at 2:58 AM, Jacques Le Roux < [hidden email]> wrote: > Done, > > Jacques > > From: "Grant Edwards" <[hidden email]> > > Thanks Jacopo. >> >> Can we get that tip removed from the wiki page ? >> >> Grant >> >> Jacopo Cappellato wrote: >> >>> Hi Grant, >>> >>> the tip in that page is no more really required because since then we >>> have removed all the keywords from the OFBiz source files. >>> >>> Jacopo >>> >>> On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: >>> >>> Thank you Ashish, at least now I have the correct config file. >>>> >>>> Now reading that tip again it states "svn:keywords properties that >>>> should be completely removed ...". >>>> >>>> Was the author of this tip, meaning change this: >>>> >>>> [auto-props] >>>> *.java = >>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>> URL Id" >>>> *.bsh = >>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>> URL Id" >>>> *.groovy = >>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>> URL Id" >>>> *.jsp = >>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>> URL Id" >>>> *.tld = >>>> svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev Author >>>> URL Id" >>>> >>>> >>>> to this: >>>> >>>> [auto-props] >>>> *.java = svn:mime-type=text/plain;svn:eol-style=native >>>> *.bsh = svn:mime-type=text/plain;svn:eol-style=native >>>> *.groovy = svn:mime-type=text/plain;svn:eol-style=native >>>> *.jsp = svn:mime-type=text/plain;svn:eol-style=native >>>> *.tld = svn:mime-type=text/xml;svn:eol-style=native >>>> >>>> >>>> Kind regards >>>> >>>> Grant Edwards >>>> >>>> >>>> >>>> Ashish Vijaywargiya wrote: >>>> >>>>> The standard ofbiz config file is here : >>>>> http://ofbiz.apache.org/svn/config >>>>> The config file on your local machine can searched on the "Home folder" >>>>> of >>>>> the "User" after enabling the feature to see the hidden files. >>>>> There is a folder .subversion and config file exists inside it. >>>>> >>>>> Suppose I work by user ashish on my Linux box. >>>>> So config file on my local machine will be available at >>>>> /home/ashish/.subversion/config. >>>>> >>>>> >>>>> I am not sure about the merging thing because I didn't play with it. >>>>> Somebody can help you on this. >>>>> >>>>> >>>>> -- >>>>> Ashish >>>>> >>>>> >>>>> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards < >>>>> [hidden email]> >>>>> wrote: >>>>> >>>>> >>>>> Hi, >>>>>> >>>>>> I am looking at >>>>>> >>>>>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchandhave a question. >>>>>> >>>>>> In the section "Import Apache OFBiz for the first time and create the >>>>>> customofbiz project" there is the following tip: >>>>>> >>>>>> /Tip: the .svnversion/conf file should be equal to the standard ofbiz >>>>>> file >>>>>> except for the svn:keywords properties that should be completely >>>>>> removed to >>>>>> avoid merging problems later on >>>>>> >>>>>> >>>>>> /Can someone please explain this to me, I really dont want to screw up >>>>>> my >>>>>> repository from the start. Where is "/svnversion/conf/", what is the >>>>>> "standard ofbiz file" and where are the svn:keywords properties? >>>>>> >>>>>> Thank you >>>>>> >>>>>> Cheers >>>>>> >>>>>> Grant Edwards >>>>>> / >>>>>> / >>>>>> >>>>>> >>>>>> >>>>> >>>>> >>> >>> >> |
|
|
Thanks for all your help, my repository is now working well.
Ashish Vijaywargiya wrote: > Thanks Jacques :) > > -- > Ashish > > On Thu, Jun 12, 2008 at 2:58 AM, Jacques Le Roux < > [hidden email]> wrote: > > >> Done, >> >> Jacques >> >> From: "Grant Edwards" <[hidden email]> >> >> Thanks Jacopo. >> >>> Can we get that tip removed from the wiki page ? >>> >>> Grant >>> >>> Jacopo Cappellato wrote: >>> >>> >>>> Hi Grant, >>>> >>>> the tip in that page is no more really required because since then we >>>> have removed all the keywords from the OFBiz source files. >>>> >>>> Jacopo >>>> >>>> On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: >>>> >>>> Thank you Ashish, at least now I have the correct config file. >>>> >>>>> Now reading that tip again it states "svn:keywords properties that >>>>> should be completely removed ...". >>>>> >>>>> Was the author of this tip, meaning change this: >>>>> >>>>> [auto-props] >>>>> *.java = >>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>>> URL Id" >>>>> *.bsh = >>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>>> URL Id" >>>>> *.groovy = >>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>>> URL Id" >>>>> *.jsp = >>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author >>>>> URL Id" >>>>> *.tld = >>>>> svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev Author >>>>> URL Id" >>>>> >>>>> >>>>> to this: >>>>> >>>>> [auto-props] >>>>> *.java = svn:mime-type=text/plain;svn:eol-style=native >>>>> *.bsh = svn:mime-type=text/plain;svn:eol-style=native >>>>> *.groovy = svn:mime-type=text/plain;svn:eol-style=native >>>>> *.jsp = svn:mime-type=text/plain;svn:eol-style=native >>>>> *.tld = svn:mime-type=text/xml;svn:eol-style=native >>>>> >>>>> >>>>> Kind regards >>>>> >>>>> Grant Edwards >>>>> >>>>> >>>>> >>>>> Ashish Vijaywargiya wrote: >>>>> >>>>> >>>>>> The standard ofbiz config file is here : >>>>>> http://ofbiz.apache.org/svn/config >>>>>> The config file on your local machine can searched on the "Home folder" >>>>>> of >>>>>> the "User" after enabling the feature to see the hidden files. >>>>>> There is a folder .subversion and config file exists inside it. >>>>>> >>>>>> Suppose I work by user ashish on my Linux box. >>>>>> So config file on my local machine will be available at >>>>>> /home/ashish/.subversion/config. >>>>>> >>>>>> >>>>>> I am not sure about the merging thing because I didn't play with it. >>>>>> Somebody can help you on this. >>>>>> >>>>>> >>>>>> -- >>>>>> Ashish >>>>>> >>>>>> >>>>>> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards < >>>>>> [hidden email]> >>>>>> wrote: >>>>>> >>>>>> >>>>>> Hi, >>>>>> >>>>>>> I am looking at >>>>>>> >>>>>>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchandhave a question. >>>>>>> >>>>>>> In the section "Import Apache OFBiz for the first time and create the >>>>>>> customofbiz project" there is the following tip: >>>>>>> >>>>>>> /Tip: the .svnversion/conf file should be equal to the standard ofbiz >>>>>>> file >>>>>>> except for the svn:keywords properties that should be completely >>>>>>> removed to >>>>>>> avoid merging problems later on >>>>>>> >>>>>>> >>>>>>> /Can someone please explain this to me, I really dont want to screw up >>>>>>> my >>>>>>> repository from the start. Where is "/svnversion/conf/", what is the >>>>>>> "standard ofbiz file" and where are the svn:keywords properties? >>>>>>> >>>>>>> Thank you >>>>>>> >>>>>>> Cheers >>>>>>> >>>>>>> Grant Edwards >>>>>>> / >>>>>>> / >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>> > > |
|
|
That's perfect Grant.
-- Ashish On Thu, Jun 12, 2008 at 4:19 AM, Grant Edwards <[hidden email]> wrote: > Thanks for all your help, my repository is now working well. > > Ashish Vijaywargiya wrote: > >> Thanks Jacques :) >> >> -- >> Ashish >> >> On Thu, Jun 12, 2008 at 2:58 AM, Jacques Le Roux < >> [hidden email]> wrote: >> >> >> >>> Done, >>> >>> Jacques >>> >>> From: "Grant Edwards" <[hidden email]> >>> >>> Thanks Jacopo. >>> >>> >>>> Can we get that tip removed from the wiki page ? >>>> >>>> Grant >>>> >>>> Jacopo Cappellato wrote: >>>> >>>> >>>> >>>>> Hi Grant, >>>>> >>>>> the tip in that page is no more really required because since then we >>>>> have removed all the keywords from the OFBiz source files. >>>>> >>>>> Jacopo >>>>> >>>>> On Jun 11, 2008, at 3:35 PM, Grant Edwards wrote: >>>>> >>>>> Thank you Ashish, at least now I have the correct config file. >>>>> >>>>> >>>>>> Now reading that tip again it states "svn:keywords properties that >>>>>> should be completely removed ...". >>>>>> >>>>>> Was the author of this tip, meaning change this: >>>>>> >>>>>> [auto-props] >>>>>> *.java = >>>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>>>>> Author >>>>>> URL Id" >>>>>> *.bsh = >>>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>>>>> Author >>>>>> URL Id" >>>>>> *.groovy = >>>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>>>>> Author >>>>>> URL Id" >>>>>> *.jsp = >>>>>> svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev >>>>>> Author >>>>>> URL Id" >>>>>> *.tld = >>>>>> svn:mime-type=text/xml;svn:eol-style=native;svn:keywords="Date Rev >>>>>> Author >>>>>> URL Id" >>>>>> >>>>>> >>>>>> to this: >>>>>> >>>>>> [auto-props] >>>>>> *.java = svn:mime-type=text/plain;svn:eol-style=native >>>>>> *.bsh = svn:mime-type=text/plain;svn:eol-style=native >>>>>> *.groovy = svn:mime-type=text/plain;svn:eol-style=native >>>>>> *.jsp = svn:mime-type=text/plain;svn:eol-style=native >>>>>> *.tld = svn:mime-type=text/xml;svn:eol-style=native >>>>>> >>>>>> >>>>>> Kind regards >>>>>> >>>>>> Grant Edwards >>>>>> >>>>>> >>>>>> >>>>>> Ashish Vijaywargiya wrote: >>>>>> >>>>>> >>>>>> >>>>>>> The standard ofbiz config file is here : >>>>>>> http://ofbiz.apache.org/svn/config >>>>>>> The config file on your local machine can searched on the "Home >>>>>>> folder" >>>>>>> of >>>>>>> the "User" after enabling the feature to see the hidden files. >>>>>>> There is a folder .subversion and config file exists inside it. >>>>>>> >>>>>>> Suppose I work by user ashish on my Linux box. >>>>>>> So config file on my local machine will be available at >>>>>>> /home/ashish/.subversion/config. >>>>>>> >>>>>>> >>>>>>> I am not sure about the merging thing because I didn't play with it. >>>>>>> Somebody can help you on this. >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Ashish >>>>>>> >>>>>>> >>>>>>> On Wed, Jun 11, 2008 at 4:34 AM, Grant Edwards < >>>>>>> [hidden email]> >>>>>>> wrote: >>>>>>> >>>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> >>>>>>>> I am looking at >>>>>>>> >>>>>>>> >>>>>>>> http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branchandhavea question. >>>>>>>> >>>>>>>> In the section "Import Apache OFBiz for the first time and create >>>>>>>> the >>>>>>>> customofbiz project" there is the following tip: >>>>>>>> >>>>>>>> /Tip: the .svnversion/conf file should be equal to the standard >>>>>>>> ofbiz >>>>>>>> file >>>>>>>> except for the svn:keywords properties that should be completely >>>>>>>> removed to >>>>>>>> avoid merging problems later on >>>>>>>> >>>>>>>> >>>>>>>> /Can someone please explain this to me, I really dont want to screw >>>>>>>> up >>>>>>>> my >>>>>>>> repository from the start. Where is "/svnversion/conf/", what is the >>>>>>>> "standard ofbiz file" and where are the svn:keywords properties? >>>>>>>> >>>>>>>> Thank you >>>>>>>> >>>>>>>> Cheers >>>>>>>> >>>>>>>> Grant Edwards >>>>>>>> / >>>>>>>> / >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>> >>>> >> >> > |
«
Return to OFBiz - User
|
1 view|%1 views
| Free forum by Nabble | Edit this page |