2014/1/12 Matt Welland <estifo...@gmail.com>:
> I've tested both these ideas and they appear to work. It does look like
> shunning or removing the initial commit is needed or somehow the code sees a
> connection between the trees. In my test half the files had no ancestor and
> did not merge and half the files did merge as "ADDED". I don't see the
> pattern but by removing the initial commit this didn't happen.
In stead of removing the initial commit, there is another way
to add multiple initial checkin's, but you have to modify the
local checkout (the .fossil or _FOSSIL_ file) manually
using the sqlite3 utility:
sqlite3 .fossil
sqlite3> UPDATE vvar SET value=0 WHERE name='checkout';
sqlite3> DELETE from vmerge;
sqlite3> DELETE from vfile;
sqlite3> .exit
fossil commit --branch <branch> ...........
The last command creates a new 'initial' commit with
whatever properties you like.
This looks more dangerous than it actually is: The ".fossil"
file keeps track of the current checkout, so it is impossible
to corrupt the actual repository, at most you could corrupt
your local checkout. But since you want to start with
a fresh checkout anyway, that's whats happening here ......
I would expect that the following command:
fossil update rid:0
would have the same effect, but that doesn't
work. It's easy to fix, but since fossil still contains
panic's in various places when rid==0 not
all commands will work. It's still considered
experimental.
2014/1/12 Matt Welland <estifo...@gmail.com>:
> I've accidentally created independent timelines in fossil before when
> importing from monotone so I know it can be done (or used to be possible).
> Is there a way to do this either with the official fossil binary or with a
> little sql hackery? What things are likely to break if I go down this path?
I don't think anything will break. Fossil cannot handle rid=0 checkouts
in all commands (yet), but "commit" works fine and after the first commit
you don't have an rid=0 checkout any more.
Regards,
Jan Nijtmans
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
