On 4/15/15, Zoltán Kócsi <zol...@bendor.com.au> wrote: > I want to merge *only* that particular set > of files of the A branch to the B branch. > > Is there a way to do that?
There are several ways to do this. Probably the best way is to designate one branch as the "main" branch. (Let's call it A.) And let all other branch derive from A. All "global" changes (changes that should be common to all branches) are applied to A. Then periodically merge A->B, A->C, A->D, and so forth. This is the usual approach taken at SQLite. The "main" branch is "trunk". But we also continuously support various derived branches: apple-osx, ota-update, and sessions. New or radically altered code that is common to all four branches goes onto trunk, then we merge trunk to the others on a periodic basis. The other thing you can do is a "partial merge" from A to B. First do a regular full merge: "fossil up B; fossil merge A". This brings over why more changes than you want, however. So then revert the files that you do not want to merge. "fossil revert file1.c file2.c ...". Then test and commit. I just did this for a branch on SQLite: https://www.sqlite.org/src/info/b8768f124ef7d79e Finally, you could just manually make the same changes in B that you made in A. The "fossil artifact" command can be used to quickly pull over new versions of files. -- 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
