Re: [fossil-users] Looking for guinea pig to test Makefile.msc changes
On Fri, Jan 25, 2013 at 9:21 AM, Александр Орефков oref...@gmail.comwrote: need fossil.res : $B\win\fossil.rc Fixed, thanks! http://fossil-scm.org/index.html/info/461a4d11d1 -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Wed, 09 Jan 2013 12:10:35 +0100, Gilles gilles.gana...@free.fr wrote: Am I correct in understanding that this is the right way to proceed to try some new code, and either save it (whether it works or not, just as a track-record) or discard it? I have another question: fossil branch ls lists branches available in the repo, but is there a command to list all the files/revisions that have been commited to the experimental branch? Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, Jan 25, 2013 at 11:59 AM, Gilles gilles.gana...@free.fr wrote:
I have another question: fossil branch ls lists branches available
in the repo, but is there a command to list all the files/revisions
that have been commited to the experimental branch?
There are two ways i know of to do that, but both show the files _in_ the
branch, whether or not they have been modified _in that branch_ since the
branch was created:
1) The web interface (/dir) allows one to browse a specific branch.
http://fossil-scm.org/index.html/dir?ci=encoding-glob
2) The JSON dir command with the checkin option:
[stephan@host:~/cvs/fossil/fossil]$ f json dir -checkin encoding-glob
{
fossil:bb63588e1bd65f1556bcf778a49833eda55c4e14,
timestamp:1359113099,
command:dir,
procTimeMs:36,
payload:{
name:/,
checkin:f480173856136f6ad30686edc875de969a6f1a91,
entries:[
...
{
name:COPYRIGHT-BSD2.txt,
uuid:c7dd1de9f9539a5a859c2b41fe4560604a774476,
size:1528,
timestamp:1274036925,
downloadPath:/raw/COPYRIGHT-BSD2.txt?name=c7dd1de9f9539a5a859c2b41fe4560604a774476
},
...
}
but note that the output format from /json/dir is a bit dumb (IMO). i would
be very glad to get input about how to improve it.
--
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, 25 Jan 2013 12:28:25 +0100, Stephan Beal sgb...@googlemail.com wrote: There are two ways i know of to do that, but both show the files _in_ the branch, whether or not they have been modified _in that branch_ since the branch was created: Thanks for the info. I don't understand what you mean by both show the files _in_ the branch, whether or not they have been modified _in that branch_ since the branch was created. Do you meant that they'll list all files in a branch, even those that were only commited once since the branch was created? I prefer to use the CLI because it's faster than the web interface. Hopefully there's an easier way than running json dir and reading its output. What about using tags to list files, eg. trunk vs. experimental? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, Jan 25, 2013 at 12:41 PM, Gilles gilles.gana...@free.fr wrote: I don't understand what you mean by both show the files _in_ the branch, whether or not they have been modified _in that branch_ since the branch was created. Do you meant that they'll list all files in a branch, even those that were only commited once since the branch was created? By that i meant: your question was a way to see what has been committed to that branch. The /dir and /json/dir commands show what is in the branch, regardless of whether it was committed in that branch or imported via the parent branch when the branch was created. I prefer to use the CLI because it's faster than the web interface. Hopefully there's an easier way than running json dir and reading its output. fossil co branchname ls -la There is no equivalent of the /dir page for the CLI. What about using tags to list files, eg. trunk vs. experimental? That works with the /dir page and /json/dir command. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, Jan 25, 2013 at 1:14 PM, Stephan Beal sgb...@googlemail.com wrote: There is no equivalent of the /dir page for the CLI. It appears that i lied, at least partially: Martin shows us the 'ls' command (which is new to me!). -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, Jan 25, 2013 at 1:11 PM, Martin Gagnon eme...@gmail.com wrote: Is this a bug or I mis understand meaning of ?VERSION? for the ls command ? FWIW: it appears to me that it does not react intuitively when given a branch name as a version: [stephan@host:~/cvs/fossil/fossil]$ fossil ls encoding-glob --age | sort -r | head 2013-01-25 08:53:54 win/Makefile.msc 2013-01-25 08:53:54 src/makemake.tcl 2013-01-24 15:19:08 win/Makefile.mingw 2013-01-24 15:19:08 src/main.mk 2013-01-24 14:38:19 src/stat.c those changes were all made in the trunk branch, not the encoding-glob branch, and have not been merged into that branch since then. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, 25 Jan 2013 13:16:46 +0100, Stephan Beal sgb...@googlemail.com wrote: It appears that i lied, at least partially: Martin shows us the 'ls' command (which is new to me!). Thanks guys. The json command doesn't exist in the Fossil I have (1.24 [0c65916136]): === [C:\]fossil json dir -checkin experimental fossil: fossil: unknown command: json fossil: use help for more information === It seems a bit involved just to know what revisions are available in a given branch. What about switching to another branch (eg. going from trunk to experimental), and simply running fossil ls? Will that list the revisions without touching the files in my work directory? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, 25 Jan 2013 14:14:20 +0100, Gilles gilles.gana...@free.fr wrote: What about switching to another branch (eg. going from trunk to experimental), and simply running fossil ls? Will that list the revisions without touching the files in my work directory? I notice that fossil update experimental -n doesn't say which work files will be replaced by what's in the experimental branch in the repo (1 file modified.): === UPDATE dummy.c --- updated-to: 80ebe786997e4fc943bbc2d9564f8bb727e81675 2013-01-11 16:36:56 UTC tags: experimental comment: Testing branches (user: Fred) changes: 1 file modified. === Generally speaking, I find running update followed by commands to list which files/revisions are available and their contents (ls, timeline, finfo, etc.) a bit dangerous. It'd be coold if there were a simple way to list files/revisions in a branch without actually checking out anything into the work directory. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, 25 Jan 2013 14:38:25 +0100, Gilles gilles.gana...@free.fr wrote: I notice that fossil update experimental -n doesn't say which work files will be replaced by what's in the experimental branch in the repo (1 file modified.): === UPDATE dummy.c --- updated-to: 80ebe786997e4fc943bbc2d9564f8bb727e81675 2013-01-11 16:36:56 UTC tags: experimental comment: Testing branches (user: Fred) changes: 1 file modified. === My mistake: I was looking lower and didn't see the UPDATE line. Not big enough :-D ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Including diff as a comment in the file with a commit message
Great, then it seems like the easiest choice. My last concern is if appending to a file using is portable enough on all platforms. I'll make some experiments and let you know if I get some resuilts. I made a ticket: http://www.fossil-scm.org/fossil/tktview/09b0f742287f3e97b42ab14764ae3a6b7d6cd558 I hope you don't mind. 2013/1/23 Richard Hipp d...@sqlite.org On Wed, Jan 23, 2013 at 9:06 AM, Petr P petr@gmail.com wrote: Is fossil_system() safe to use for invoking another instance of fossil? Is this idea used already in some command? The fossil_system() function was created for the purpose of running instances of fossil recursively and to do so correctly across platforms. Examples: http://www.fossil-scm.org/fossil/artifact/de8fed4fe46c?ln=220-227 http://www.fossil-scm.org/fossil/artifact/a34c5b6508?ln=113-117 -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Right way to try something new and save/revert?
On Fri, Jan 25, 2013 at 2:59 AM, Gilles gilles.gana...@free.fr wrote: On Wed, 09 Jan 2013 12:10:35 +0100, Gilles gilles.gana...@free.fr wrote: Am I correct in understanding that this is the right way to proceed to try some new code, and either save it (whether it works or not, just as a track-record) or discard it? I have another question: fossil branch ls lists branches available in the repo, but is there a command to list all the files/revisions that have been commited to the experimental branch? I think 'fossil diff --brief --branch experimental' might be what you're looking for. Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Looking for guinea pig to test Makefile.msc changes
On Fri, Jan 25, 2013 at 3:54 AM, Stephan Beal sgb...@googlemail.com wrote: On Fri, Jan 25, 2013 at 9:21 AM, Александр Орефков oref...@gmail.comwrote: need fossil.res : $B\win\fossil.rc Fixed, thanks! http://fossil-scm.org/index.html/info/461a4d11d1 I don't know about nmake syntax, but other reference to B in Makefile.msc use brackets. e.g: $(B) instead of just $B I know that () are needed in GNU and BSD Makefiles, but I don't know about nmake.. Regards -- Martin G. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Looking for guinea pig to test Makefile.msc changes
On Fri, Jan 25, 2013 at 10:45 PM, Martin Gagnon eme...@gmail.com wrote:
I don't know about nmake syntax, but other reference to B in Makefile.msc
use brackets.
e.g: $(B) instead of just $B
Good point - i was copy/pasting from an MSC user ;).
I know that () are needed in GNU and BSD Makefiles, but I don't know about
nmake..
Standard(ish) makes allow vars to be expanded without () or {} if they are
a single character:
http://pubs.opengroup.org/onlinepubs/009695399/utilities/make.html
No idea about nmake, but looking at Makefile.msc, i see $O and $B in other
places, so i'll leave it for now unless someone reports it broken.
--
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Looking for guinea pig to test Makefile.msc changes
Works for me after parking my previous tweaks in a private branch and updating to trunk. I did not exercise the $B question since I've been following the path of least resistance and building in the win folder. After opening a VS2010 32-bit command prompt and changing to the win folder, nmake -f Makefile.msc FOSSIL_ENABLE_JSON=1 just worked. The resulting fossil.exe runs, and fossil version reports: This is fossil version 1.25 [461a4d11d1] 2013-01-25 08:53:54 UTC The json support also works well enough that my ticket report writer utility just works. (I still need to publish that, I will do that real soon now.) I checked and the tweaks I had made to v1.24 to get json under windows were mostly in Makefile.msc and no longer needed. The other substantive tweak was a bug in blob.c only evident in a Windows compile that Richard fixed last November in checkin [9073d8dcc7]. Now to go build with Markdown turned on, and play with the new toy... On 1/25/2013 1:54 PM, Stephan Beal wrote: No idea about nmake, but looking at Makefile.msc, i see $O and $B in other places, so i'll leave it for now unless someone reports it broken. I'm reasonably certain that nmake does allow single-char variables to be referenced without parenthesis. -- Ross Berteig r...@cheshireeng.com Cheshire Engineering Corp. http://www.CheshireEng.com/ +1 626 303 1602 +1 626 351 1590 FAX ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Pull isn't pulling, or something
I should mention that the pull issue for machine A disappeared after a new commit was pushed to the server from machine B. Everything is back to normal with the original affected repo. Thanks, Edward Blake ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Please show your support for Fossil by adding to your stack on Ohloh.net
I wonder, how hard is to make some kind of fake server that to accept read/info requests in protocols used in git|svn|cvs|bazaar|Hg, translate them to fossil and then returns the response to the client (in particular to ohloh statistics engine) using the respective protocol. This server might be useful for other tasks as well. On Tue, 18 Dec 2012 16:26:27 -0500 Marc Laporte m...@marclaporte.com wrote: Hi! Fossil is pretty awesome. I believe more visibility will bring more users contributors and a good place for this is Ohloh.net What is Ohloh.net? Think of it as a Wikipedia-like semi-structured database about all FOSS projects. It helps to evaluate projects and having good information there increases the odds of attracting more developers users. Currently, Fossil is pretty low on this list: http://www.ohloh.net/tags/dvcs So please visit: http://www.ohloh.net/p/fossil-scm (or the page of any FOSS project you use) Then, click on the button I use this. You will need to create an account/login. I know it's a little demotivating because Fossil is not yet a supported SCM on Ohloh.net, but I believe if we show stronger stats, it increases our odds to change this. Here are some related discussions: https://www.ohloh.net/forums/3491/topics/6447 http://www.fossil-scm.org/index.html/tktview?name=0f36ec7790 More details about Ohloh.net and why I think it's useful/awesome: http://info.tiki.org/article168-Support-Tiki-and-your-favorite-Free-Open-Source-projects-on-Ohloh-net Thank you and best regards, -- Marc Laporte http://MarcLaporte.com http://Tiki.org/MarcLaporte http://AvanTech.net http://svg-edit.googlecode.com http://jquerysheet.googlecode.com http://sourceforge.net/p/jcapture-applet/ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- John Found http://asm32.hopto.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
