[fossil-users] approach to select file from repository based on platform?
Hello, I like to put my ~/bin folders from OpenBSD, Linux 32 and 64bit and Mac OS X into Fossil reposity. Most files are bash or python scripts, so identical for all platforms. But for binary files, I need different file for every platform. I can have fossil.linux32, fossil.macosx, .., but it's not elegant. Can I somehow utilise Fossil to have different binary per platform (so fossil binary will be only one and the correct one on each platform)? Thank you, Jiri -- Jiri Navratil, http://www.navratil.cz, +420 777 224 245 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] approach to select file from repository based on platform?
Jiří Navrátil j...@... writes: Thank you for advice. I didn't used branches so far. Could you look bellow and help me concrete implementation? ... I've done the following to simulate the branches: 1. create a dummy binary file f.exe 2. adding and commiting to fossil using fossil add f.exe fossil commit f.exe -m ... 3. changing the file to a windows version and creating a windows branch with fossil commit f.exe -f -m tag to branch win --branch windows 4. updating to trunk: fossil update trunk 5. changing the file to a max binary and commiting on a mac branch fossil commit f.exe --force -m tag to branch mac --branch mac From now on, i can change between versions by updating the single file to the corresponding branches: fossil update windows .. If i want to change a file on a branch, i have to do: 1. update to the branch fossil update macos f.exe 2. change the file to next version 3. commit it simply with commit, fossil commit -m mac v2 you can the results of this on http://chiselapp.com/user/wst/repository/import-vendor-test/ best regards Wolfgang ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Merging multi-level-branches
On Sun, Oct 17, 2010 at 4:06 AM, Wolfgang rat...@stumvolls.de wrote: Hello I don't know, if the following behaviour is a feature, a bug or if this solution would be a feature request. I like to work with branches. Asuming: 1. i have a trunk development, using version 1, 2, 3 2. i started a branch name b1 at 1 and committed some changes 1.1.1, 1.1.2, 1.1.3 3. i started a second branch named b2 on the branch 1 at 1.1.2 using versions 1.1.2.1.1, 1.1.2.1.2 The above version numbers are given in CVS notation. If i decide to merge branch 2 to main trunk, i would expect, that merge b2 apllies patches 1.1.2.1.1, 1.1.2.1.2. But fossil merges the complete patch sequence starting from 1.1.1 to 1.1.2.1.2 to my trunk version 3. Fossil reads the commandline argument b2 and searches for the newest version with this tag and apllies all patches from the common base 1.1 until the found branch version. My expactation: Only diffs occuring on the branch should be apllied. I see only one chance: Applying all patches from the branch p2 using --cherrypick. Is this intended? The behavior is as intended. best regards Wolfgang ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
