Re: [fossil-users] auto-sync before merge?

2014-10-13 Thread Ramon Ribó
NB// there are two general contexts for a merge, merge from a branch or merge from a node. When merging from a node there is no ambiguity and this conversation does not apply. However when merging from a branch there *is* ambiguity. The don't sync crowd sees the merge as applying to the tip of

Re: [fossil-users] http --enforce-remote-user

2014-10-13 Thread Stephan Beal
On Mon, Oct 13, 2014 at 3:58 AM, David Mason dma...@ryerson.ca wrote: Yeah shunning is a really big stick. If I understand it correctly, if you ever shunned a 0-length file, you would never be able to commit a zero-length file again! Er that's an excellent point. Perhaps we need to

Re: [fossil-users] auto-sync before merge?

2014-10-13 Thread j. v. d. hoff
On Mon, 13 Oct 2014 10:12:02 +0200, Ramon Ribó ram...@compassis.com wrote: NB// there are two general contexts for a merge, merge from a branch or merge from a node. When merging from a node there is no ambiguity and this conversation does not apply. However when merging from a branch there

Re: [fossil-users] auto-sync before merge?

2014-10-13 Thread Kees Nuyt
[Default] On Mon, 13 Oct 2014 10:29:36 +0200, j. v. d. hoff veedeeh...@googlemail.com wrote: On Mon, 13 Oct 2014 10:12:02 +0200, Ramon Ribó ram...@compassis.com wrote: On Sun, 12 Oct 2014 18:58:25 -0700, Matt Welland estifo...@gmail.com wrote: [] autosync. For most of us bandwidth is

Re: [fossil-users] Ordering ticket priority/severity

2014-10-13 Thread org.fossil-scm.fossil-users
On 2014-10-13T06:40:37 +0100 Jacek Cała jacek.c...@gmail.com wrote: Hi, Below is one of my ticket report pages. I'm not entirely sure it's the best approach but works fine for me. What it does is two selects. The inner select classifies status, priority, severity and difficulty so then I

Re: [fossil-users] http --enforce-remote-user

2014-10-13 Thread Scott Robison
On Oct 13, 2014 7:42 AM, David Mason dma...@ryerson.ca wrote: On 13 October 2014 04:54, Tony Papadimitriou to...@acm.org wrote: The claim that once you shun a 0-length file you will not be able to commit another 0-length file again is not entirely true. If you first delete the existing

Re: [fossil-users] auto-sync before merge?

2014-10-13 Thread Ron W
On Sun, Oct 12, 2014 at 9:58 PM, Matt Welland estifo...@gmail.com wrote: Auto sync before merge and after tagging would have saved me a few support calls from confused users over the past few years :) The after tagging: part I agree with. *Maybe* in the case of bringing in the latest from

Re: [fossil-users] http --enforce-remote-user

2014-10-13 Thread Stephan Beal
On Mon, Oct 13, 2014 at 6:44 PM, Scott Robison sc...@casaderobison.com wrote: On Oct 13, 2014 7:42 AM, David Mason dma...@ryerson.ca wrote: pointing out what a big stick this was. Perhaps pointing out this edge-case in the documentation or the shunning web page would be sufficient (or a

Re: [fossil-users] http --enforce-remote-user

2014-10-13 Thread Ron W
On Sun, Oct 12, 2014 at 9:58 PM, David Mason dma...@ryerson.ca wrote: Yeah shunning is a really big stick. Probably better to quarantine than to auto-shun Any content flagged as quarantined could be reviewed, then any that's truly spam shunned. (Any illegal (or otherwise illegitimate) may be