Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-13 Thread Jan Nijtmans
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

Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-13 Thread Stephan Beal
On Mon, Jan 13, 2014 at 10:56 AM, Jan Nijtmans jan.nijtm...@gmail.comwrote: 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

Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-12 Thread Richard Hipp
On Sun, Jan 12, 2014 at 1:06 PM, Matt Welland estifo...@gmail.com wrote: I find myself wanting to maintain multiple fossils per project since some parts need to decoupled from the source. This is a pain since now I have to remember to sync multiple fossils, The fossil all sync command should

Re: [fossil-users] Multiple independent timelines in a fossil - how to create and what are the unintended consequences?

2014-01-12 Thread Matt Welland
On Sun, Jan 12, 2014 at 12:01 PM, Richard Hipp d...@sqlite.org wrote: On Sun, Jan 12, 2014 at 1:06 PM, Matt Welland estifo...@gmail.com wrote: I find myself wanting to maintain multiple fossils per project since some parts need to decoupled from the source. This is a pain since now I have