Re: [fossil-users] How to find out when a line was removed

2017-09-25 Thread Richard Hipp
On 9/25/17, John P. Rouillard wrote: >> >>Example: The line at >>https://www.fossil-scm.org/fossil/annotate?origin=trunk=src/diff.c=d9ef474a1 >>is missing from trunk. To find out where it was deleted, use the >>following URL: >>

Re: [fossil-users] Merge question

2017-09-25 Thread Stephan Beal
On Mon, Sep 25, 2017 at 5:32 PM, Andy Goth wrote: > whatever was going on. Might want to explicitly turn on more warnings > like -Wunused or -Wall or even -Wextra to help spot these types of issues.) > Sidebar: i tried -Wall with fossil years ago but it didn't like

Re: [fossil-users] How to find out when a line was removed

2017-09-25 Thread Richard Hipp
On 9/25/17, John P. Rouillard wrote: > > So do I need the exact revision where the line existed, or do I just > need a revision earlier than when I think the line was last deleted? > Any version prior to where the line was deleted. The reverse annotation will tell you the

Re: [fossil-users] Amended check-in time

2017-09-25 Thread Andy Bradford
Thus said Richard Hipp on Mon, 25 Sep 2017 16:04:32 -0400: > It does work sometimes, at least: https://fossil-scm.org/fossil/info/1f378f9e3 I've seen it work before too, so I'm not sure why it would be different with the steps Andy Goth provided. Guess it will take some

Re: [fossil-users] Tech note search

2017-09-25 Thread Chris Rydalch
Thanks so much Andy, this is great! So far so good on my end... On Sun, Sep 24, 2017 at 12:11 AM, Andy Goth wrote: > I implemented tech note search capability on the search-technote branch. > Please have a look and let me know if it's good. Maybe the way I named >

[fossil-users] Merge question

2017-09-25 Thread Andy Goth
In response to Chris Rydalch saying that search-technote works for him, in combination with it passing all my tests, I'd like to merge it to trunk. What is the correct procedure for doing so? If I do: $ f up trunk $ f merge search-technote -baseline root:search-technote -integrate Then any

Re: [fossil-users] Merge question

2017-09-25 Thread Andy Goth
On 09/25/17 10:39, Richard Hipp wrote: On 9/25/17, Andy Goth wrote: As far as I can tell, in the general case I described in my previous email, assuming waiting was not an option, the best to do would have been to explicitly specify the -baseline option when merging

Re: [fossil-users] Merge question

2017-09-25 Thread Andy Goth
On 09/25/17 10:18, Richard Hipp wrote: On 9/25/17, Andy Goth wrote: In response to Chris Rydalch saying that search-technote works for him, in combination with it passing all my tests, I'd like to merge it to trunk. What is the correct procedure for doing so? At this

Re: [fossil-users] Merge question

2017-09-25 Thread Richard Hipp
On 9/25/17, Andy Goth wrote: > As far as I can tell, in the general case I described in my previous > email, assuming waiting was not an option, the best to do would have > been to explicitly specify the -baseline option when merging the child > branch and later when

Re: [fossil-users] Merge question

2017-09-25 Thread Richard Hipp
On 9/25/17, Andy Goth wrote: > In response to Chris Rydalch saying that search-technote works for him, > in combination with it passing all my tests, I'd like to merge it to trunk. > > What is the correct procedure for doing so? > > At this point I'm inclined to just be

Re: [fossil-users] Tech note search

2017-09-25 Thread Andy Goth
On 09/25/17 09:35, Chris Rydalch wrote: Thanks so much Andy, this is great! So far so good on my end... Merged to trunk, along with all the other recent developments. Please update and test some more, if you don't mind. -- Andy Goth | ___

Re: [fossil-users] Amended check-in time

2017-09-25 Thread Andy Goth
On 09/21/17 20:48, Andy Goth wrote: On 09/21/17 19:51, Richard Hipp wrote: I don't have any idea [why] the tags are not working for you. Try this sequence: f new repo.fossil mkdir ckout cd ckout f open ../repo.fossil touch xxx f add xxx f commit -date-override 2018-01-01 -m 'add xxx' sleep 5

[fossil-users] Using Fossil with Apache Proxy

2017-09-25 Thread David Mason
I am trying things differently this year. I want to use one instance of fossil running proxied behind a firewall. I have the following in my Apache conf file: ProxyPass http://127.0.0.1:8081 ProxyPassReverse http://127.0.0.1:8081 SetOutputFilter proxy-html

Re: [fossil-users] Using Fossil with Apache Proxy

2017-09-25 Thread Richard Hipp
On 9/25/17, David Mason wrote: > I am trying things differently this year. I want to use one instance of > fossil running proxied behind a firewall. I have the following in my > Apache conf file: > > > ProxyPass http://127.0.0.1:8081 > > ProxyPassReverse

Re: [fossil-users] How to find out when a line was removed

2017-09-25 Thread Richard Hipp
On 9/23/17, John P. Rouillard wrote: > > I am trying to find out when a line dissapeared from a file. > As of the latest version of Fossil (checked into trunk moments ago) you can do this: fossil annotate $filename -r $oldversion -o trunk $filename is the name of

Re: [fossil-users] Amended check-in time

2017-09-25 Thread Andy Bradford
Thus said Andy Goth on Mon, 25 Sep 2017 10:45:23 -0500: > Has anyone tried running these commands yet? I want to see if anyone > else can replicate my problem. Sorry, I misinterpreted your comment about having a bad timezone (except in Narnia) as a retraction of your original problem. And now

Re: [fossil-users] Amended check-in time

2017-09-25 Thread Andy Bradford
Thus said Andy Goth on Mon, 25 Sep 2017 10:45:23 -0500: > Has anyone tried running these commands yet? I want to see if anyone > else can replicate my problem. I just tried and was able to reproduce the problem. It happens on rebuild whether one does it via the ``fossil amend''

Re: [fossil-users] Amended check-in time

2017-09-25 Thread Richard Hipp
On 9/25/17, Andy Bradford wrote: > Thus said Andy Goth on Mon, 25 Sep 2017 10:45:23 -0500: > >> Has anyone tried running these commands yet? I want to see if anyone >> else can replicate my problem. > > I just tried and was able to reproduce the problem. It