On Sat, Nov 11, 2017 at 7:00 AM, <fossil-users-requ...@lists.fossil-scm.org>
wrote:
>
> Date: Sat, 11 Nov 2017 10:22:15 +0000
> From: Thomas Levine <_...@thomaslevine.com>
> Subject: [fossil-users] [Nmh-workers] Merging Source Files with git.
> (fwd)
>
> Ralph asks whether a particular feature is available in git,
> so I am curious, is it available in fossil?
>
> ------- Forwarded Message
>
> Date: Fri, 10 Nov 2017 23:51:07 +0000
> From: Ralph Corderoy <ra...@inputplus.co.uk>
>
> This suggests foo_{add,del,find,save,tweak}.c should in time become
> foo.c, allowing globals to become statics in foo.c, and currently global
> structs, etc., to also move to foo.c. Is there a good way of doing
> this, in multiple stages if necessary, that allows git to preserve the
> chain of history? Say telling it foo_add.c is now foo.c in one commit,
> and then foo_del.c has merged with foo.c in the next.
>
I think you could do that with a serials of operations. (I have NOT tested
any of this)
1. Create a branch for combining the files
2. fossil mv foo_add.c foo.c
3. fossil ci
4. Branch again
5. Edit foo_del.c to include functions from foo.c
6. fossil rm foo.c
7. fossil ci
8. fossil mv foo_del.c foo.c
9. fossil ci
10. Merge this branch to branch created in 1, then check in the result
11. Goto 4 and repeat for next foo_*.*
12. Merge final result (in branch from 1) to trunck (or where ever "1" came
from)
In theory, could do this without creating a new branch for each foo_*.* but
the "extra" branching will help make the combining history clearer.
These steps can probably be simplified.
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
