I have two questions. I looked at the archives, but only one of the issues I found some mentioning of, and even that was not clear-cut.
1. How do you merge only certain files? Let's say, we have two branches, 'release' and 'devel'. The development branch is fairly different from the current release, but in due course the developers discovered a neat little bug which is present in the release version as well. It would be most useful to merge the bugfix into the release branch (and put out a bugfix release) but of course the whole development branch must not be merged into the stable release branch. One can of course check out the release branch in a separate directory and hand-patch the files from the devel tree one by one, then check it all in but it seems more of a work-around than a solution - after all, merging files and maintaining revisions is why we have a distributed SCM in the first place. Probably I'm blind, but I could not find any option for the merge command that would allow me to specify a set of files to merge. Is there a hidden option or is it some separate command? 2. Does fossil store the mtime for the files? If yes, is there any way to obtain it? For various reasons I'd need to get a tree with the actual modification times (there are external dependencies that fossil doesn't and actually can't understand) and I would like, after the checkout, to go through the whole tree and set every file's mtime to the actual mtime it had when it was last committed before the current check-out. Yes, I am aware of the make issue, but under my circumstances the need of doing a make clean is actually a lot less harmful than losing track of the modification time of every file at every checkout. I know that with some scripting I can get the timestamp of the last commit for each file. Although, even that is not trivial, as fossil finfo happily lists all changes that happened *after* the current check-out version, or even on completely different branches, but with some extra work one can work out the last commit of the file that happened on the current branch or its ancestor, and before or at the current check-out version. However, if fossil at all stores (and versions) the mtime, that would be much better. Does it? Any help would be much appreciated, Thanks, Zoltan _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
