Consider the following scenario: Let's say I have two branches of a project, a version A and a version B of a product (for example, they go to two different markets with slightly different requirements or some other reason) but of course A and B share a lot of common stuff. Or we can have a release branch where only bugfixes are done and a development branch with all sorts of new features but not guaranteed to work stuff. It doesn't matter much why we have two active branches, but we do. What matter is this:
While working on 'A' I find a better implementation for a module, which consists of a handful of code and header files and is used by both branches. I therefore re-write the entire module, implementing the new superior algorithm, test it and indeed it is a Good Thing. Then I'd like to apply the same changes on the 'B' branch as well, for obvious reasons. I can't merge the two branches, as they really are separate versions, rather, 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? That is, merge only a bunch of files between two branches but leave everything else untouched on both branches (and of course still having two branches)? Note that there already are all sorts of differences between the branches, not just the files of the re-written module. I can of course check out one branch in one directory and the other in an other, hand-copy the files from A to B and then check-in B to the common repository, but that seems to be a very stone-age solution and defeating the purpose of having a database that keeps track of all the relationships between files and branches and versions. Any advice would be most welcome. Thanks, Zoltan _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
