Re: [fossil-users] fossil rebase

2010-06-23 Thread Eric
> Git rebase help has a very good graphic to explain what it does: > > Assume the following history exists and the current branch is "topic": > > A---B---C topic > / > D---E---F---G master > > From this point, the result of either of the following commands: > > git rebase ma

Re: [fossil-users] fossil rebase

2010-06-23 Thread altufaltu
Git rebase help has a very good graphic to explain what it does: Assume the following history exists and the current branch is "topic": A---B---C topic / D---E---F---G master From this point, the result of either of the following commands: git rebase master git rebase mas

Re: [fossil-users] Windows build broken?

2010-06-23 Thread altufaltu
Thanks. This works correctly. -Original Message- From: Richard Hipp To: fossil-users@lists.fossil-scm.org Sent: Wed, Jun 23, 2010 8:56 pm Subject: Re: [fossil-users] Windows build broken? On Wed, Jun 23, 2010 at 10:43 AM, wrote: Hi DRH, I can build fossil from trunk now. However

Re: [fossil-users] fossil rebase

2010-06-23 Thread Stephen De Gabrielle
Thanks, I liked the description of your workflow. You should put it on the website. S. On Wednesday, June 23, 2010, Richard Hipp wrote: > > > On Wed, Jun 23, 2010 at 3:42 AM, wrote: > > Well, my understanding of rebase has changed since then, due to the > same problem we faced. Git 'forgets' u

Re: [fossil-users] Windows build broken?

2010-06-23 Thread Richard Hipp
On Wed, Jun 23, 2010 at 10:43 AM, wrote: > Hi DRH, > > I can build fossil from trunk now. > > However, there seems some issue with date/time. It shows incorrect date: > You're right. This was a bug in the current-time implementation of SQLite on windows. It has now been fixed (both in SQLite a

Re: [fossil-users] Windows build broken?

2010-06-23 Thread altufaltu
Hi DRH, I can build fossil from trunk now. However, there seems some issue with date/time. It shows incorrect date: $ rm test.fsl $ ./fossil new test.fsl project-id: 6e13be383106646451d79a5eae4f731c84d22135 server-id: f0202d8c43fc11569996c45150aca4740ffd49c6 admin-user: altufaltu (initial passw

Re: [fossil-users] Windows build broken?

2010-06-23 Thread Richard Hipp
On Wed, Jun 23, 2010 at 7:28 AM, Richard Hipp wrote: > > > On Wed, Jun 23, 2010 at 3:44 AM, wrote: > >> I'm trying to build 953d293c32 version of fossil for Windows, which >> seems broken: >> >> gcc -g -O2 -o makeheaders .\\src\\makeheaders.c >> awk "{ printf \"#define MANIFEST_UUID \\\"%%s\\\"\

Re: [fossil-users] Windows build broken?

2010-06-23 Thread Richard Hipp
On Wed, Jun 23, 2010 at 3:44 AM, wrote: > I'm trying to build 953d293c32 version of fossil for Windows, which > seems broken: > > gcc -g -O2 -o makeheaders .\\src\\makeheaders.c > awk "{ printf \"#define MANIFEST_UUID \\\"%%s\\\"\n\", $1}" > .\\src\\..\\manifest.uuid >VERSION.h > gawk: { printf "

Re: [fossil-users] fossil rebase

2010-06-23 Thread Richard Hipp
On Wed, Jun 23, 2010 at 3:42 AM, wrote: > Well, my understanding of rebase has changed since then, due to the > same problem we faced. Git 'forgets' unpublished versions when doing > rebase (but it need not - I may still be wrong here). I'm sure if > fossil implements rebase, it will not forget o

Re: [fossil-users] A lightweight plain skin for Fossil: Plain Wedding

2010-06-23 Thread Dig412
This is a really nice theme, thanks for releasing it! On 21 June 2010 16:12, wrote: > I have to say I'd love to see this skin incorporated, very nice work. > > -Original Message- > From: "Richard Hipp" > Sent: Monday, June 21, 2010 11:01am > To: fossil-users@lists.fossil-scm.org > Subje

[fossil-users] Windows build broken?

2010-06-23 Thread altufaltu
I'm trying to build 953d293c32 version of fossil for Windows, which seems broken: gcc -g -O2 -o makeheaders .\\src\\makeheaders.c awk "{ printf \"#define MANIFEST_UUID \\\"%%s\\\"\n\", $1}" .\\src\\..\\manifest.uuid >VERSION.h gawk: { printf "#define MANIFEST_UUID \"%%s\"\n", } gawk:

Re: [fossil-users] fossil rebase

2010-06-23 Thread altufaltu
Well, my understanding of rebase has changed since then, due to the same problem we faced. Git 'forgets' unpublished versions when doing rebase (but it need not - I may still be wrong here). I'm sure if fossil implements rebase, it will not forget old versions. What I'm interested in is the 'fe