[fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Remco Schoen
Hi, I use mainly MacBooks for my work and OS X doesn't put the diff-window in the foreground and even last in the used applications list. This would always mean a lot of ALT-TAB-ing or SHIFT-ALT-TAB to reach it. That is quite cumbersome :) Yesterday I found some time and got it working the way

Re: [fossil-users] IPV6 Support

2015-04-03 Thread Oliver Friedrich
Andy Bradford amb-sendok-1430621661.lfonacgmnndpbedgo...@bradfords.org schrieb am Fr., 3. Apr. 2015 um 04:54 Uhr: Thus said Oliver Friedrich on Thu, 02 Apr 2015 20:56:38 -: zIpAddr's use isn't very well documented here. Basically, you can influence which IP address ``fossil

[fossil-users] Cherrypicking a folder to a separate repository

2015-04-03 Thread Remco Schoen
Hi, I was wondering if there is a way to split off all changes from files in a certain directory to a separate directory. I tried with the new bundle command and as well the commands export, import and diff, but I didn't get anywhere. Kind regards, Remco Schoen

Re: [fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Jan Nijtmans
2015-04-03 9:06 GMT+02:00 Remco Schoen remco_sch...@me.com: Hi, I use mainly MacBooks for my work and OS X doesn't put the diff-window in the foreground and even last in the used applications list. This would always mean a lot of ALT-TAB-ing or SHIFT-ALT-TAB to reach it. That is quite

Re: [fossil-users] Introducing Lagerstatte, an open-source hosting service for Fossil repositories

2015-04-03 Thread Vikrant Chaudhary
While I know very little about databases, this sounds a lot like any records not found in the local database would be read from a remote database. And any writes would be to the local database with updates to the remote being managed by an explicit update procedure. And this would happen at

[fossil-users] Error synchronizing private check-ins

2015-04-03 Thread Mikhail Kryshen
Hello, I encountered a problem trying to transfer private check-ins between personal clones of a repository: $ fossil pull --private --once ssh://host/fossils/project.fossil Round-trips: 2 Artifacts sent: 0 received: 0 SQLITE_CONSTRAINT: abort at 8 in [INSERT INTO private VALUES(10049)]:

Re: [fossil-users] Two trunks?

2015-04-03 Thread Richard Hipp
On 4/3/15, Sean Woods s...@seanwoods.com wrote: How can I merge both of these branches back into one trunk? fossil merge (with no arguments) should merge together all forks of the branch you are working on. -- D. Richard Hipp d...@sqlite.org ___

[fossil-users] Two trunks?

2015-04-03 Thread Sean Woods
I am working on a project with a colleague. We're working from different machines. When I look at the timeline, it appears that at some point recently the trunk diverged. In other words, what was once one stream of updates (depicted visually with the boxes and lines) is now two lines, each line

Re: [fossil-users] Two trunks?

2015-04-03 Thread Sean Woods
On Fri, Apr 3, 2015, at 08:25 AM, Richard Hipp wrote: On 4/3/15, Sean Woods s...@seanwoods.com wrote: How can I merge both of these branches back into one trunk? fossil merge (with no arguments) should merge together all forks of the branch you are working on. Thanks, that fixed it.

Re: [fossil-users] Two trunks?

2015-04-03 Thread Richard Hipp
On 4/3/15, Sean Woods s...@seanwoods.com wrote: On Fri, Apr 3, 2015, at 08:25 AM, Richard Hipp wrote: On 4/3/15, Sean Woods s...@seanwoods.com wrote: How can I merge both of these branches back into one trunk? fossil merge (with no arguments) should merge together all forks of the branch

Re: [fossil-users] Introducing Lagerstatte, an open-source hosting service for Fossil repositories

2015-04-03 Thread Vikrant Chaudhary
This may be related to the scaling issue, see the discussion started by Richard Hipp, entitled Fossil 2.1: Scaling. Some great ideas by Richard and very useful feature for large repositories (like Matt and Andy have). Though I think his intended goals are slightly different than what I was

[fossil-users] fossil timeline to gource

2015-04-03 Thread klaute
Hi, last days I have written a small script to convert the fossil timeline (verbose commandline) to a gource [1] readable output. It works fine for me, so its just FYI. You can find the tool here [2]. Kai -- gource [1]: https://code.google.com/p/gource/ fossil to gource [2]:

Re: [fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Remco Schoen
Op 3 apr 2015 om 16:36 uur uur schreef Remco Schoen remco_sch...@me.com: Op 3 apr. 2015 om 09:58 heeft Jan Nijtmans jan.nijtm...@gmail.com het volgende geschreven: 2015-04-03 9:06 GMT+02:00 Remco Schoen remco_sch...@me.com: Hi, I use mainly MacBooks for my work and OS X doesn't put the

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread Andy Bradford
Thus said klaute on Fri, 03 Apr 2015 18:29:32 +0200: last days I have written a small script to convert the fossil timeline (verbose commandline) to a gource [1] readable output. That looks interesting. Do you have a demo screenshot of Fossil? :-) Thank, Andy -- TAI64 timestamp:

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread klaute
That looks interesting. Do you have a demo screenshot of Fossil? :-) Thanks! I have recently uploaded a small demo video on youtube [1]. Have fun! Kai --- fossil trunk [1]: https://youtu.be/ce9WyWOV4zA ___ fossil-users mailing list

Re: [fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Jan Nijtmans
2015-04-03 18:32 GMT+02:00 Remco Schoen remco_sch...@me.com: Is there a way to check versions of Tcl and Tk? If fossil is compiled with Tcl support: $ fossil version -v This is fossil version 1.32 [5811ecd7cc] 2015-03-20 14:50:16 UTC Compiled on Mar 20 2015 22:21:56 using gcc-4.9.2

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread John Found
There seems to be at least one bug in the script. The line: log.append(tmpdata) ...should be something like: log.append(copy.deepcopy(tmpdata)) ...well, at least according to my very low python skills. Otherwise, adding a new entry to log changes the previous ones and this way

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread John Found
Sorry, I am not git/github user. Feel free to use the code from my e-mails, or your own fixes (as I said, my python skills are close to zero). On Sat, 4 Apr 2015 00:10:47 +0200 klaute kla...@gmx.de wrote: Thanks for the comments!!! Feel free to send me a diff/patch file with your

Re: [fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Remco Schoen
Op 3 apr 2015 om 21:35 uur uur schreef Jan Nijtmans jan.nijtm...@gmail.com: 2015-04-03 18:32 GMT+02:00 Remco Schoen remco_sch...@me.com: Is there a way to check versions of Tcl and Tk? If fossil is compiled with Tcl support: $ fossil version -v This is fossil version 1.32 [5811ecd7cc]

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread John Found
Also, another bug is not supporting the spaces in the file names. The code: if 1 == toadd: tstr = line.split( ) tmpdata[file] = tstr[1] log.append(copy.deepcopy(tmpdata)) Should be: if 1 == toadd: tstr = line.split( , 1) # Only one split. tmpdata[file] = tstr[1] #

[fossil-users] Question about fossil mv

2015-04-03 Thread Zoltán Kócsi
Can someone explain me how exactly fossil manages moves? The actual problem is the following. Let's have a project, foo, with the following structure: foo/x/a.c foo/x/b.c foo/y/c.c foo/y/d.c The project sits on a central server. Two developers, Alice and Bob have their local clones on their

Re: [fossil-users] Introducing Lagerstatte, an open-source hosting service for Fossil repositories

2015-04-03 Thread Kees Nuyt
On Fri, 3 Apr 2015 16:15:51 +0530, Vikrant Chaudhary vikr...@webstream.io wrote: On Wed, Apr 1, 2015 at 4:21 AM, Vikrant Chaudhary vikr...@webstream.io wrote: While I know very little about databases, this sounds a lot like any records not found in the local database would be read from a

Re: [fossil-users] fossil timeline to gource

2015-04-03 Thread Andy Bradford
Thus said John Found on Sat, 04 Apr 2015 01:25:27 +0300: Sorry, I am not git/github user. Feel free to use the code from my e-mails, or your own fixes (as I said, my python skills are close to zero). Except, that you correctly point out that if you pass a dictionary into a function, it

Re: [fossil-users] fossil diff -tk on OS X

2015-04-03 Thread Remco Schoen
Op 3 apr. 2015 om 09:58 heeft Jan Nijtmans jan.nijtm...@gmail.com het volgende geschreven: 2015-04-03 9:06 GMT+02:00 Remco Schoen remco_sch...@me.com: Hi, I use mainly MacBooks for my work and OS X doesn't put the diff-window in the foreground and even last in the used applications list.