Re: [fossil-users] Zip command creates zip files that confuse Windows XP

2012-05-25 Thread Pavel Aronsky
A quick research showed that there were indeed changes in zip format, not supported by WinXP Explorer but supported in Vista. ZIP64 is one of these. (http://en.wikipedia.org/wiki/Zip_%28file_format%29#Structure) So, this probably is just WinXP showing its age. Thanks, -- pa

[fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
Hello. 1) I created a private branch, made several commits, and then merged the private branch with the current trunk. Rather than seeing the commits I made on the private branch in the timeline for the trunk, I only see the one large commit resulting from accumulating all the smaller commits

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Richard Hipp
On Fri, May 25, 2012 at 11:42 AM, org.fossil-scm.fossil-us...@io7m.comwrote: Hello. 1) I created a private branch, made several commits, and then merged the private branch with the current trunk. Rather than seeing the commits I made on the private branch in the timeline for the trunk, I

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org wrote: On Fri, May 25, 2012 at 11:42 AM, org.fossil-scm.fossil-us...@io7m.comwrote: Is it possible to avoid squashing all private commits into one? The branch is private. If all the individual commits where pushed out to

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
On Fri, 25 May 2012 16:10:44 + org.fossil-scm.fossil-us...@io7m.com wrote: On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org wrote: On Fri, May 25, 2012 at 11:42 AM, org.fossil-scm.fossil-us...@io7m.comwrote: Is it possible to avoid squashing all private commits into

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Matt Welland
On Fri, May 25, 2012 at 9:10 AM, org.fossil-scm.fossil-us...@io7m.comwrote: On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org wrote: On Fri, May 25, 2012 at 11:42 AM, org.fossil-scm.fossil-us...@io7m.comwrote: Is it possible to avoid squashing all private commits into one?

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
On Fri, 25 May 2012 10:18:34 -0700 Matt Welland estifo...@gmail.com wrote: On Fri, May 25, 2012 at 9:10 AM, org.fossil-scm.fossil-us...@io7m.comwrote: On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org wrote: On Fri, May 25, 2012 at 11:42 AM,

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Richard Hipp
On Fri, May 25, 2012 at 1:09 PM, org.fossil-scm.fossil-us...@io7m.comwrote: On Fri, 25 May 2012 16:10:44 + org.fossil-scm.fossil-us...@io7m.com wrote: On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org wrote: On Fri, May 25, 2012 at 11:42 AM,

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
On Fri, 25 May 2012 13:34:54 -0400 Richard Hipp d...@sqlite.org wrote: I don't think so, not other than checking each one out and recommitting them one by one. To do otherwise would be changing the history of the project, which Fossil does not allow (by design). That's fine. Which commands

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Lluís Batlle i Rossell
On Fri, May 25, 2012 at 01:34:54PM -0400, Richard Hipp wrote: On Fri, May 25, 2012 at 1:09 PM, org.fossil-scm.fossil-us...@io7m.comwrote: On Fri, 25 May 2012 16:10:44 + org.fossil-scm.fossil-us...@io7m.com wrote: On Fri, 25 May 2012 11:53:35 -0400 Richard Hipp d...@sqlite.org

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Lluís Batlle i Rossell
On Fri, May 25, 2012 at 01:49:06PM -0400, Richard Hipp wrote: On Fri, May 25, 2012 at 1:42 PM, Lluís Batlle i Rossell vi...@viric.namewrote: I don't think so, not other than checking each one out and recommitting them one by one. To do otherwise would be changing the history of the

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Richard Hipp
On Fri, May 25, 2012 at 1:51 PM, Lluís Batlle i Rossell vi...@viric.namewrote: On Fri, May 25, 2012 at 01:49:06PM -0400, Richard Hipp wrote: On Fri, May 25, 2012 at 1:42 PM, Lluís Batlle i Rossell vi...@viric.namewrote: I don't think so, not other than checking each one out and

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Lluís Batlle i Rossell
On Fri, May 25, 2012 at 01:53:23PM -0400, Richard Hipp wrote: On Fri, May 25, 2012 at 1:51 PM, Lluís Batlle i Rossell vi...@viric.namewrote: Ah, I thought that branches could be made back public easily. I never used privated branches still, so I have zero practise with them. As for the

Re: [fossil-users] Signing

2012-05-25 Thread Ron Wilson
On 5/23/12, Lluís Batlle i Rossell vi...@viric.name wrote: But what would you sign? The original tree? Comment updates? Tags? Dates? All until some point? What on later changes to the checkin? To answer your last question, you can only sign what exists at the time of the signing. In the

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Nolan Darilek
On 05/25/2012 11:10 AM, org.fossil-scm.fossil-us...@io7m.com wrote: That's one interpretation of private, yes. I took it to mean that the branch wouldn't be synced, or visible, on any remotes. I don't think that necessarily implies coalescing commits like that... If it's not possible, I can

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Scott Robison
On Fri, May 25, 2012 at 12:26 PM, Nolan Darilek no...@thewordnerd.info wrote: Shame, I actually kind of liked that individual commits were preserved. Squashing and such was part of why I left Git. History should be preserved, whether you are working alone in private or in the open. History is

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread org.fossil-scm.fossil-users
On Fri, 25 May 2012 17:41:44 + org.fossil-scm.fossil-us...@io7m.com wrote: On Fri, 25 May 2012 13:34:54 -0400 Richard Hipp d...@sqlite.org wrote: I don't think so, not other than checking each one out and recommitting them one by one. To do otherwise would be changing the history

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Richard Hipp
So, clearly, I just need to revisit the whole private branch concept As originally implemented, private branches were just a marking in the database. But then somebody (aku?) pointed out that if you export and reimport the database, the private markings are lost, since database entries are

[fossil-users] Fossil code sprint. Was: DRH to be in Munich, Germany July 3rd, 2012

2012-05-25 Thread Richard Hipp
On Tue, May 15, 2012 at 12:20 PM, Stephan Beal sgb...@googlemail.comwrote: Richard Hipp will be in Munich, Germany for a few days in July and has graciously[1] offered to host a presentation and/or hacking session with regards to sqlite and/or Fossil SCM. My desire is to have a Fossil

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Andreas Kupries
On 5/25/2012 12:28 PM, Richard Hipp wrote: So, clearly, I just need to revisit the whole private branch concept As originally implemented, private branches were just a marking in the database. But then somebody (aku?) While I don't remember that, it would certainly be in my line of

Re: [fossil-users] losing history in private branch merge?

2012-05-25 Thread Gour
On Fri, 25 May 2012 15:28:02 -0400 Richard Hipp d...@sqlite.org wrote: So perhaps we should go back to the original design? As far as private branches are concerned, I'd like to be able to selectively rm single private branch when using 'scrub'. Otoh, Mercurial has nice concept of Phases

Re: [fossil-users] [sqlite] Fossil code sprint. Was: DRH to be in Munich, Germany July 3rd, 2012

2012-05-25 Thread Stephan Beal
For those who missed the notice about Richard's visit the first time around: https://plus.google.com/104981852298046595282/posts/JhpKW3zXScj On Fri, May 25, 2012 at 9:45 PM, Richard Hipp d...@sqlite.org wrote: * User preferences stored in a cookie Adding persistent user preferences on top