Hi, I worried how we could maintain converging code mercurial clone of jpoker, when diverging on data (mockup.svg and css/images directory).
I discussed this on #pokersource and #mercurial: And several alternatives emerged: 1/ Maintain a single repository for code and data - Pull changes from one to another using hg pull - Begin merge - And revert images mockup.svg and css/images directory, to the previous revision before commiting the merge 2/ Split code and data repository - Only pull changes in code repository - And have a script to cook jpoker with alternative data 3/ Maintain a single repository, and put each skin (mockup.svg + css/images directory) in separate directory - Pull changes using hg pull - And modify the Makefile to select and build jpoker with a specific skin directory What do you think ? -- bou ^ _______________________________________________ Pokersource-users mailing list [email protected] https://mail.gna.org/listinfo/pokersource-users
