From: Stins, D. <DR...@Zi...> - 2004-08-23 21:29:51
|
CVS checks for conflicts and when it finds some, then it refuses to merge= . You have to merge then manually, because two developers changed the same lines of the code. The amounts of conflicts that it does detect can be reduced by merging frequently to all branches. Ofcourse does testing find the final issues, but when we use CVS right th= en I am pretty sure that those issues are in 99% of the cases not caused by CVS. But ofcourse there will be a learning curve how to use CVS in a proper wa= y. When you still have some doubts, then please discuss it at inf...@gn.... I would be pleased when you are able to define exactly in which cases CVS damages the merging process without returning an error/warning. Dick ----- Original Message ----- From: "skaill" <sk...@ro...> To: <web...@li...> Sent: Monday, August 23, 2004 10:41 PM Subject: Re: [Web-erp-developers] New Look > Thanks for all the info, Dick. I will look at those other cvs clients. > > The only concern I would have is if it actually tries to intelligently merge > code within the same file. I've seen the damage done by these types of > mergers and would try to avoid doing that part. There is just no way f= or a > machine to do that intelligently and I could explain why but it would b= e > long winded. > > Steve > > ----- Original Message ----- > From: "Stins, Dick" <DR...@Zi...> > To: <web...@li...> > Sent: Monday, August 23, 2004 3:45 PM > Subject: Re: [Web-erp-developers] New Look > > > Hoi All, > > Yes, cvs is tough when you start with it. > > When you are using windows, then I recommend tortoise as cvs client. It= 's > not as advanced as wincvs, but it is much easier to use. > > It is integrated with the file explorer. All commands are in the popup menu > from a right click with your mouse. Also a difference tool is available= . > > For other information (mainly cvs command line commands) , you can join the > cvs list inf...@gn.... > > CVS helps you to keep control over your sources when you use it right. > > It would be possible to setup a developers branch (release) a test release, > a beta release, production release, ... > > CVS enables also to develop in parallel by creating branches for: > - translations > - userinterface > - tax improvements > - > > When one branch is finished, you can merge it with the trunk and create= a > new weberp release without having to wait for to finish the other branc= hes > in progress. > > Ofcourse you can get complicated situations with version you can't merg= e > automatically, so it needs to be coordinated carefully (in practise: me= rge > regularly everywhere) to reduce situations where you need to merge different > branches manually. > > When the project keeps growing, then we would be glad that we are able = to > use cvs in a proper method to keep control on the sources. > > With best regards, > > Dick Stins > > ----- Original Message ----- > From: skaill > To: web...@li... > Sent: Monday, August 23, 2004 5:33 AM > Subject: Re: [Web-erp-developers] New Look > > > Hi Rom, > > Well I can tell you what I've figured out so far about cvs. Others can tell > you more I'm sure. If you are using Windows then this will be more helpful > and if not then maybe someone else can fill in the Linux blanks. Also, Phil > has a link to the SourceForge cvs explanation although it's more convoluted > and less practical than what I'll explain here. > > WinCVS seems to be the best so find it, download it and install it. Th= ey > have a link to it from SourceForge. Now you are about half way there. = Go > into WinCVS and click on Admin > Login. Click on the General tab. Fil= l in > the following > > pserver > /cvsroot/web-erp > cvs.sf.net > anonymous > ano...@cv...:/cvsroot/web-erp > > I went to the Globals tab and checked Checkout read-only as well. Don'= t > honestly know if it's needed though. > > Next, click on Remote > Checkout module. Type in web-erp in the top ar= ea > then select a local folder where it will be downloaded. Click OK and i= t > should download the newest cvs version to the local folder. > > Voila! > > There are ways of updating your cvs, etc. but I have been keeping it simple. > I rename my local folder and then download a new copy. I then use my > awesome compare tool to see what has changed and to move my changes in from > another copy I work with. > > Hope this helps. I really don't know why the SourceForge instructions have > to be so impractical. They are enough to scare anyone off for good, I > swear. Anyway, that should get you started and you can go from there. > > Some others may be able to add some helpful hints. > > The idea is to know what files, tables and graphics you have changed an= d to > give them to Phil. He will look it over and put what he decides into t= he > cvs. Phil makes good decisions, except the one I don't agree with him > about...hahaha...just kidding. > > After Phil moves the changes into the cvs it is good to download it and test > to make sure whatever you did that he incorporated works correctly. > > Steve > > > > ----- Original Message ----- > From: Rom Pereira > To: web...@li... > Sent: Sunday, August 22, 2004 10:57 PM > Subject: RE: [Web-erp-developers] New Look > > > Hello Steve and All, > > =D8 I'm thinking that possibly you're working from the old interf= ace. > Have you downloaded the most recent cvs? By the way, if you haven't, t= hey > seem to be having trouble with it for the last week. You'll either hav= e to > wait or > =D8 maybe Phil has a copy that he could send. > > Yes, I did this based on the download version of webERP. I did not join the > CVS efforts yet. Where should I start? > > =D8 The graphics are very good. The font on the menu is too smal= l as it > displays on mine. Do you mean to have the Selects in that Go To drop-down? > > Yes, it is quite small. I am still doing some work on it since there ar= e 2 > concerns in that part: 1) the description of the icons and 2) the > translation of it. I was thinking in maybe making the Modules Navigatio= n a > pull down menu. I don't know. All inputs are welcome :D. > > > Personally I'd like to drop the plus sign at the end of webERP as I think > any punctuation makes it difficult for people to catch onto and readily > communicate. I believe a name that is represented the same everywhere = and > without > anything that hinders remembering it quickly and long term me= ans > it spreads quicker. Especially in web searches, etc. However, that's > Phil's call. > > I just copy the actual way you write down the logo. As you said it is Phil's > call. I just did a little redesign since "web" and "erp" are two differ= ent > word and in languages like mine (Brazilian Portuguese) it sounds like o= ne > word. So it would be important, in my point of view (I can be wrong), t= o > show that it is 2 words. I agree about the identity thing. One cannot change > its name otherwise it looses it identity. > > > I find these days that several of the erp vendors have gone with past= el > (calmer) shades as a color scheme. In fact earth tones seem to be the > "norm". Accpac has varying shades of soft browns, blues (some harder)a= nd > greys > including their icons. Great Plains uses soft to medium blues, > greys, browns and soft, sort of grey/green. Navision is soft blues and > browns. Possibly others may disagree. Is it possible to reshade the > graphics into a pastel > color scheme? > > I just copy and paste the icons in the interface. The green and orange makes > it more commercial now-a-days, but I do agree with you that the pastels are > more neutral and it is hard that people hates it. Who does not like pastels > can easily ignore it. But my idea is the following: with CSS it is easy= to > change the main interface colors and we can do (as soon as we decide to use > the Everaldo icons and the he sends to me the vector version of his ico= ns so > we can change the coloring on them) different versions of the icons for the > different themes. So we can have 10 different versions of the coloring = of > the icons and much more combinations of the CSS schemes. > > Best regards, > > Rom Pereira > ----- Original Message ----- > From: Rom Pereira > To: web...@li... > Sent: Thursday, August 19, 2004 8:12 AM > Subject: [Web-erp-developers] New Look > > Dear All, > > I am designing a new look for the interface (I am doing the design job,= so > please don't mind the graphics) and would like to know your opinion abo= ut > it: > > http://www.primor.ind.br/i/weberp_01_18.08.2004.jpg > > I kept all 3 navigations on it: > > - The icons are the navigation between modules; > > - The pull down menu is the navigation inside the modules (main menu an= d so > on) > > - The items below are the same. > > The interface is good for 800x600, but it is possible to do a "slim" version > that will fit in smaller screen widths. > > Please let me know your input, > > Best Regards, > > Rom Perei > > > > > ------------------------------------------------------- > SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media > 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33 > Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift. > http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285 > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > > ------------------------------------------------------- > SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media > 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33 > Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift. > http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285 > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers |