Re: [fossil-users] tracking cherry-picked merges?

2011-04-12 Thread Ron Wilson
On Tue, Apr 12, 2011 at 11:47 AM, Alaric Snell-Pym wrote: > On 04/12/11 14:37, Richard Hipp wrote: >> Back-porting important bug fixes from trunk to an historical version >> branch.  For example: http://www.sqlite.org/src/ci/e8177e0149 >> > > Also good. I tend to just wholesale merge trunk in, but

Re: [fossil-users] About reconstruct command

2011-04-12 Thread Joshua Paine
Not sure about the problems you ran into at the end, but fossil reconstruct is the complementary command to fossil deconstruct. It works on a directory full of artifacts dumped by fossil deconstruct, not on your source code. If you want to add all your files quickly to a new repo, you'd do som

[fossil-users] About reconstruct command

2011-04-12 Thread Pavel Aronsky
Greetings, I try to use 'reconstruct' command to quickly populate a new repo and serve it, but have no luck. Is it a stupid beginner error on my part or maybe a bug? Here is how I run it in the root of source tree; > fossil reconstruct my.fossil . spins for a while and creates my.fossil fi

Re: [fossil-users] tracking cherry-picked merges?

2011-04-12 Thread Alaric Snell-Pym
On 04/12/11 14:37, Richard Hipp wrote: > On Tue, Apr 12, 2011 at 9:17 AM, Alaric Snell-Pym > wrote: > >> What are people's use-cases for cherry picks, out of interest? >> > > Back-porting important bug fixes from trunk to an historical version > branch. For example: http://www.sqlite.org/src/ci/e8

Re: [fossil-users] tracking cherry-picked merges?

2011-04-12 Thread Richard Hipp
On Tue, Apr 12, 2011 at 9:17 AM, Alaric Snell-Pym wrote: > What are people's use-cases for cherry picks, out of interest? > Back-porting important bug fixes from trunk to an historical version branch. For example: http://www.sqlite.org/src/ci/e8177e0149 -- D. Richard Hipp d...@sqlite.org

Re: [fossil-users] tracking cherry-picked merges?

2011-04-12 Thread Alaric Snell-Pym
On 04/11/11 19:11, Richard Hipp wrote: > Fossil does not (currently) record any information about cherry-picks. I > did make an extension to the file format to allow Fossil to do this in the > future. But I only made that extension this year. If any information is > recorded about cherry-picks,

Re: [fossil-users] Odd behavior for 'default user'

2011-04-12 Thread Richard Hipp
On Tue, Apr 12, 2011 at 1:40 AM, Ron Aaron wrote: > I have a developer helping me on a project. He clones my repo using his > user name. > > Then, when he does a push, I see the commit as 'User' instead of his > user name. He's on Windows, which is probably why it's 'User' instead > of somethin