On Sat, Nov 11, 2017 at 8:40 PM, <fossil-users-requ...@lists.fossil-scm.org>
wrote:

>
> Subject: Re: [fossil-users] [Nmh-workers] Merging Source Files with
>         git.    (fwd)
>

Richard said:

There is no way to track file merges in Fossil.  Nor is there a way to
> track splits - when a single source code file is split into multiple
> smaller files because the original became too large.
>

And I said:

I think you could do that with a serials of operations. (I have NOT tested
> any of this)
>

Clarifying my response:

True, Fossil only tracks merges on the commit level. So, not (directly)
possible to track merges of differently named files.

On the other hand, Fossil does track renaming files.

My proposal indirectly uses this renaming tracking to track the merges. It
does require several commits for each file. My proposed procedure is
(possibly over) cautious in that it makes a commit after each file
operation. It might be possible to accomplish with less frequent commits.
Also, if more than one set of files is being merged ( foo*.c => foo.c,
bar*.c => bar.c, etc ), should be able to do all of the same operation for
each set then commit.
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to