Re: [fossil-users] painful merge

That's a painful way to do it. Unless you have conflicts, merging should be painless. It sounds to me like you are using 'fossil gdiff' to resolve your merges manually instead of using 'fossil merge'? This was only a work around because I couldn't use meld to resolve my merge. I do always use

Re: [fossil-users] quick poll: do you generally use add/rm or mv

I would use mv. Having had bad experiences with other source control systems where you loose history with add/rm type commands, I would use mv to retain that. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org

Re: [fossil-users] painful merge

I never got any problems with line endings and I do want fossil to be my merge tool. I got the trunk source of fossil and modified it locally to work with p4merge. p4merge requires the output file to exist. in merge_3way function I changed it with the following lines:   zCmd =

Re: [fossil-users] painful merge

diff Index: src/file.c == --- src/file.c +++ src/file.c @@ -118,40 +118,45 @@    }else{ if( fossil_stat(zFilename, fileStat, isWd)!=0 ){    fileStatValid = 0;    rc = 1; }else{    fileStatValid = 1;    rc =

[fossil-users] bring back a deleted file; unsure of command syntax

Hi, I did a merge, merging trunk into my sound branch. I submitted it and then I noticed that merge had caused fossil to delete some files (the files were in the sound branch but not in trunk). How can I go back to the previous revision of a specific file to restore it? on sound branch

Re: [fossil-users] Name of ZIP file for "ZIP archive"

I put Stephen and not Stephan. Sorry. My mistake. Kev ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] fossil reporting MISSING for existing file

Hi, I have a strange problem with fossil on my linux machine. Somehow I broke it and I don't know how. Whenever I make an edit, "fossil changes" will report those edits but also display: MISSING build_notes.txt That file exists locally and exists in the "main" fossil repository too. My

[fossil-users] Name of ZIP file for "ZIP archive"

Hi, In fossil I can select a change, click on "ZIP archive" to download a zip. This is nice. I have been using it frequently and I have been asking people who are not using fossil to get a snapshot of the code. However the file is always named "zip" without extension. When extracted it has a

Re: [fossil-users] Name of ZIP file for "ZIP archive"

Hi Stephen, Can the fossil zip command be used to configure the name for the UI? >If that's happening when you click the zip button in the UI, then that's a >bug. i cannot reproduce that on the main fossil site. Yes it happens via the UI. Click on artifact Click on Download ZIP Login with

Re: [fossil-users] Name of ZIP file for "ZIP archive"

Hi Stephan, The bug doesn't happen if you're logged in. You have to be logged out. Click the download zip link login as anonymous then a page appears with a download button clicking this button gives the wrong name. I have e-mailed you the link to the fossil repository I am using. I didn't post

Re: [fossil-users] Name of ZIP file for "ZIP archive"

Thankyou Andy and Stephan! :) Kev ___ 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] characters outside of commit comment are included in comment

>Your shell (bash) is doing this, not Fossil. Bash hands Fossil the >string "This is a test£" with no indication of whether or not it was >originally quoted nor where the quotes ended. Ok. :) ___ fossil-users mailing list

[fossil-users] unversioned files - converting files from versioned to unversioned and limiting the number of versions

Hi, I have some binary files in my repository which are currently versioned. I see there is a new unversioned file feature and I would like to convert them to unversioned. Is there a way to "convert" a file from versioned to unversioned? In Perforce there is a way to limit the number of

[fossil-users] visual studio solution and project file for fossil

Hi I am not familiar enough with the fossil build system so I hope somebody can answer these questions. Is there a way to generate a visual studio solution and project file from the fossil source which I can then load up in visual studio 2015 community edition? Or an alternative: is there a

Re: [fossil-users] visual studio solution and project file for fossil

> Fossil's primary use is to keep track of changes in your files, it is not a > build system perse. If you want to use Visual Studio, why not use something > like CMake: Hi Arjun, Thankyou for your reply. Sorry but after reading back my question I don't think I worded it well and I didn't

Re: [fossil-users] unable to revert fossil mv

Update: I am seeing this: kevin@kevin:~/arnold/test/disc$ fossil changes MISSING disk_sizes/data.dsk MISSING disk_sizes/data2sides.dsk MISSING disk_sizes/ramdosd1.dsk MISSING disk_sizes/system.dsk MISSING disk_sizes/system42.dsk MISSING disk_sizes/system80t1s.dsk MISSING disk_sizes/test.dsk

Re: [fossil-users] unexpected result with fossil mv on a directory

Hi, I re-read my message back and realised I may have caused confusion: disc/drivetest exists - it is the directory with files I want to move, but when I say when neither "disc" or "drivetest" exists, I meant "test/disc" and "test/disc/drivetest" sorry if I caused confusion. Thanks Kevin

[fossil-users] unable to revert fossil mv

Hi, I have a directory called test it contains a directory called disc and a directory called disk_sizes. test/disk_sizes contains a few files with extension "dsk". I wanted to do this move: test/disk_sizes -> test/disc/disk_sizes I worked around the other problem I reported by creating

[fossil-users] windows build patch to use vs2015 static analysis

Hi, Here is a patch that sets the /analyze compiler switch which enables the vs2015 static analysis output. I have tested it with vs2015 community edition and the latest source distribution of fossil 1.36. START --- C:/Users/kev/Downloads/fossil-src-1.361/fossil-1.36/win/Makefile.msc    Mon

[fossil-users] unexpected result with fossil mv on a directory

Hi, I think I may have found a bug with fossil mv related to moving directories. I am using fossil version 1.35 3aa86af6aa 2016-06-14 11:10:39 UTC. I wanted to use fossil mv to move a directory tree. The tree looks like this: test/drivetest and I wanted to move it to test/disc/drivetest If I

Re: [fossil-users] unexpected result with fossil mv on a directory

LOL one more try: test/drivetest exists and has files. test/disc/drivetest or test/disc doesn't exist. ___ 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] unable to revert fossil mv

Steve, I agree with you it is confusing! I have used fossil for over 2 years now (and I continue to use it because I like it very much) but I haven't used the move operation much in that time and each time I do use it the two step move is confusing. I am used to other source control systems

[fossil-users] fossil amend comment

Hi, I submitted a change and made a mistake in the comment. I wanted to change the comment and fix it. I did this: fossil amend ba67fcd67c -m "fixed snapshot" command reported the comment, tags and uuid. fossil changes showed nothing. I looked at the server and there was no changes. I

[fossil-users] UNMANAGE status

Hi If I do a revert of a file that doesn't exist locally or in the repository I get a status like this: fossil revert 2.txt UNMANAGE 2.txt I think the UNMANAGE status can be read in more than one way. I often read it as "fossil used to manage this file but it's not managing it now". But it

[fossil-users] fossil reports erroneous revert?

Hi, If I do the following: fossil new test fossil open test echo >1.txt fossil add 1.txt fossil commit -m "add file" fossil changes (doesn't report changes) fossil revert 1.txt REVERT 1.txt fossil changes (doesn't report changes) I am reverting a file that has been added to the repository but

[fossil-users] fossil revert is not recursive?

Hi, I am using windows and it's standard command-line. I can use "fossil add " to add a directory and it's sub-directories and the files within. However, I can't seem to revert a directory in the same way even though that directory exists. I tried "fossil revert " and "fossil revert /*.*"

[fossil-users] src/info.c use of zUuid after it has been free.

Hi, I want to ask a question about some lines in src/info.c In this function: show_common_info on this line: if( zUuid && showComment ) zUuid is potentially pointing to freed memory (freed in the previous function). It is ok because the code doesn't use it. Should the code check zUUid? If

[fossil-users] request for change of error message (autosync fail and pressing ctrl+c).

Hi, I attempted to commit to the fossil server I use but it was inaccessible (I think the connection was down) and the autosync failed. If I press ctrl+c I get a different error compared to answering 'n'. The ctrl+c error seems more scary. Here is the output:

Re: [fossil-users] Follow-up to reverting missing files

Hi Andy, That is useful. What would the windows equivalent command-line? ___ 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] revert of missing files using wildcard not possible.

>I suppose this is so obvious to people who grew up with Unix that we >don't even think about it.  Are you coming from a windows background? Yes. I have been programming on windows since 1995 and from the beginning I used Visual C++ and later Visual Studio (before then it was mostly Z80). I have

Re: [fossil-users] windows build patch to use vs2015 static analysis

BTW, There are around 400 warnings. I posted just a few of them. So please compile with this patch to the makefile and visual studio 2015 with the analyze option enabled to see them all. A few more: c:\users\kev\downloads\fossil-src-1.36\fossil-1.36\src\sqlite3.c(113673) : warning C6239: ( &&

[fossil-users] fossil mv with wildcards inconsistent operation (and more two step merge frustrations)

Hi, I found an unexpected inconsistency with fossil mv on files when using wildcards. I want to move 2 files into another directory: itest.asm and itest.bin Both files exist in the repository. If both exist locally: fossil mv itest.* newdir then fossil will rename *both*. changes show both

[fossil-users] revert of missing files using wildcard not possible.

Hi, This is probably related to move and missing files in general. It's not possible to do a revert using a wildcard to revert multiple missing files. You have to specify them one by one. For example: I used mv to move some files: intlace.asm intlace.bat intlace.bin intlace.sh I did not

Re: [fossil-users] revert of missing files using wildcard not possible.

Ok, I understand that wildcards are expanded by the shell but it would make it *SO* much easier to use if fossil could do some kind of pattern matching or use wildcards to allow me to revert a group of files. It feels a little inconsistent to me that I can't use wildcards throughout. I can

[fossil-users] Re: debugging fossil with VisualStudio debugger

Hi Artur, Thank you for the information. I never knew an exe could be debugged this way because I've never needed to do it that way. What I would like to point out is that for most visual studio and windows users this is a strange way to work. Windows users are used to working almost

Re: [fossil-users] revert of missing files using wildcard not possible.

I tested the automatic expansion of wildcards on windows and linux. Here is my program: #include #include int main(int argc, char **argv) { int i; for (i=0; i

Re: [fossil-users] revert of missing files using wildcard not possible.

Hi Andy, Try this: kevin@kevin:~$ mkdir fossil kevin@kevin:~$ cd fossil kevin@kevin:~/fossil$ fossil new test project-id: 72090bfca4c8d0618530e7b7b524056a25bf4052 server-id: f38e157351c762cbdb09d581ca17e1d70cb68f0c admin-user: kevin (initial password is "c821e4") kevin@kevin:~/fossil$ fossil

[fossil-users] fossil 1.2->2.1 - hash policy "auto" doesn't seem to work and gives SQL error.

Hi All, i downloaded windows version of fossil 2.1 - after initial problems crashing when I ran it (see other thread) and rebuilding it was fine. I used fossil hash-policy to set it to sha3 and forced a commit to the server because I didn't have files in my changes at that time. From then on

Re: [fossil-users] fossil 1.2->2.1 - hash policy "auto" doesn't seem to work and gives SQL error.

Hi Richard, >The "auto" hash-policy automatically flips to "sha3" as soon as Fossil >sees one or more SHA3 artifacts in the repo.  Since your repo contains >SHA3 artifacts, you won't be able to set the policy to "auto" because >it will immediately and automatically flip to "sha3". > >That is the