Hello, Robert Spanton <rspan...@zepler.net> wrote: > The key word being "if". If and when the issue arises, then we fix it.
In other words, you are willing to break it and won't fix. >> 2. Run rename-bool.sh with the pcb source as the working dir. This >> replaces switches all .c and .h files over to using bool, true, >> and false. It then goes to work on the .y and .l files. My sed >> fu is weak, so it only does the replacement in the top and >> bottom sections of those files. There is not much to change in >> the middle sections, and step 3 sorts it out. > > I forgot to mention that this script can be used with git filter-branch. > If one has some existing commits that haven't been pushed, one can > convert them over to bool like so: > > git filter-branch --tree-filter rename-bool.sh HEAD...${HASH} > > Replacing ${HASH} with the hash of the most recent commit shared with > the main repository. This *should* remove merge conflicts to do with > bool. Why not apply it to your local branch instead of PCB master? Best wishes, Ineiev _______________________________________________ geda-user mailing list geda-user@moria.seul.org http://www.seul.org/cgi-bin/mailman/listinfo/geda-user