Re: [fossil-users] Creating new branch/repository problems

2011-10-20 Thread Matt Welland
Lets go though it step by step to ensure we aren't making wrong assumptions about what you are doing. I'm not trying to be condescending, I know you probably already know all this but from the error message it is very unclear what is going on. It looks to me like you are on Linux, is that correct?

Re: [fossil-users] Creating new branch/repository problems

2011-10-20 Thread Jared Harder
I tried this command: ./fossil branch -R groupcomm.fossil new spread groupcomm.fossil I got this response: ./fossil: unable to locate check-in off of which to branch I then tried to make sure that the groupcomm.fossil repository was the one that was "open" by doing ./fossil open groupcomm.fossil

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Ron Wilson
2011/10/20 Lluís Batlle i Rossell : > On Thu, Oct 20, 2011 at 11:31:01AM -0700, Mike Meyer wrote: >> Hmm - maybe the "readonly-glob" setting is enough? If it's not set, you get >> the current behavior. Otherwise, you check it when you pull files out of the >> repository (to set them read-only) or c

Re: [fossil-users] Creating new branch/repository problems

2011-10-20 Thread Martin Gagnon
On Thu, Oct 20, 2011 at 05:01:50PM -0700, Jared Harder wrote: >Hello all! >I had a Fossil server set up but needed to migrate it to a new server due >to its closure. The normal clone functionality was used to pull over >everything and from what I can tell it's all working properly.

Re: [fossil-users] Creating new branch/repository problems

2011-10-20 Thread Alexandre Sénéchal
Hi, You may start with this page: http://fossil-scm.org/index.html/doc/trunk/www/faq.wiki#q3 I think the problem is that you are trying to create branch outside of an open checkout. Others may correct me if I am wrong. Regards, AlexS On Thu, Oct 20, 2011 at 8:01 PM, Jared Harder wrote: > Hello

[fossil-users] Creating new branch/repository problems

2011-10-20 Thread Jared Harder
Hello all! I had a Fossil server set up but needed to migrate it to a new server due to its closure. The normal clone functionality was used to pull over everything and from what I can tell it's all working properly. My problems right now is that I have several uses that need to be submitting th

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Gilles
On Thu, 20 Oct 2011 15:56:43 +0200, Kohn Bernhard wrote: >it works. You just have to add a new submenu item with the same name but >different File Type. To this submen you can add a item. > >http://imageshack.us/photo/my-images/830/fastexplorerfos.png Thanks much for the tip :-) I'll look aroun

Re: [fossil-users] Veracity

2011-10-20 Thread Matt Welland
On Thu, Oct 20, 2011 at 10:07 AM, Mike Meyer wrote: > On Thu, Oct 20, 2011 at 3:46 AM, Martin Gagnon wrote: > >> On 2011-10-20, at 01:13, Jeff Slutter wrote: >> >> > A couple weeks ago I posted about the possibility of a new configuration >> setting called something like "allow-binmerge" (defau

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Lluís Batlle i Rossell
On Thu, Oct 20, 2011 at 11:31:01AM -0700, Mike Meyer wrote: > 2011/10/20 Lluís Batlle i Rossell > > > On Thu, Oct 20, 2011 at 11:07:23AM -0700, Mike Meyer wrote: > > > On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment > > wrote: > > > How about an having a way to flag files - when created - as "

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Mike Meyer
2011/10/20 Lluís Batlle i Rossell > On Thu, Oct 20, 2011 at 11:07:23AM -0700, Mike Meyer wrote: > > On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment > wrote: > > How about an having a way to flag files - when created - as "read-only" > or > > some such. (I think someone else may have suggested

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Lluís Batlle i Rossell
On Thu, Oct 20, 2011 at 11:07:23AM -0700, Mike Meyer wrote: > On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment wrote: > The problem is that locking in a distributed environment is hard to do > reliably. "Mostly" reliable could well be worse than no locking at all: you > start to depend on it, an

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Brian Cottingham
This is my favorite approach so far- simple, straightforward, and no complications related to offline commits or someone forgetting to remove a lock. On Thu, Oct 20, 2011 at 2:07 PM, Mike Meyer wrote: > On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment wrote: > >> I'm a novice Fossil user worki

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Lluís Batlle i Rossell
On Thu, Oct 20, 2011 at 11:05:33AM -0700, Michael Barrow wrote: > I just wanted to point out that Fossil has a Wiki and ticketing system built > into it; these are two other methods that could be used to communicate with > other team members that you would be working on something that they should >

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Mike Meyer
On Thu, Oct 20, 2011 at 10:54 AM, Chris Peachment wrote: > I'm a novice Fossil user working in a small group with need > to track both text and binary files. > > It seems to me that locks are nice to have for text files > since 3 way diffs can be merged at relatively little cost. > But inability

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Lluís Batlle i Rossell
On Thu, Oct 20, 2011 at 01:54:19PM -0400, Chris Peachment wrote: > So a lock would provide immediate warning when attempting > checkout that someone else is probably touching the file. > Out of band communication would be needed to gain access > - not a bad thing and better than proceeding blindly

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Michael Barrow
I just wanted to point out that Fossil has a Wiki and ticketing system built into it; these are two other methods that could be used to communicate with other team members that you would be working on something that they should not touch. I'm just sayin' Friends don't let friends use locks in

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Matt Welland
2011/10/20 Lluís Batlle i Rossell > Thinking as if we had to implement locks some day... > > I just thought that we could have locks working not on > file-paths-in-branch, but > on artifacts. That would expand well to multiple branches. > > Then, if anyone gets the lock, and commits a new version

Re: [fossil-users] More thoughts on locks

2011-10-20 Thread Chris Peachment
I'm a novice Fossil user working in a small group with need to track both text and binary files. It seems to me that locks are nice to have for text files since 3 way diffs can be merged at relatively little cost. But inability to merge binary files might mean painful hand merging based on side by

[fossil-users] More thoughts on locks

2011-10-20 Thread Lluís Batlle i Rossell
Thinking as if we had to implement locks some day... I just thought that we could have locks working not on file-paths-in-branch, but on artifacts. That would expand well to multiple branches. Then, if anyone gets the lock, and commits a new version, it could get locked automatically too, expandi

Re: [fossil-users] Veracity

2011-10-20 Thread Mike Meyer
On Thu, Oct 20, 2011 at 3:46 AM, Martin Gagnon wrote: > On 2011-10-20, at 01:13, Jeff Slutter wrote: > > > A couple weeks ago I posted about the possibility of a new configuration > setting called something like "allow-binmerge" (default off). If it is > enabled, and there is a gmerge-command se

Re: [fossil-users] Veracity (was: Fwd: suggestion on fossil)

2011-10-20 Thread Lluís Batlle i Rossell
On Wed, Oct 19, 2011 at 06:42:21PM -0400, Richard Hipp wrote: > On Wed, Oct 19, 2011 at 6:17 PM, Michael Barrow wrote: > > > No -- please no locks! > > > > > Concur. Locks are out-of-band for Fossil. If anybody thinks they really, > really need locks, I'll be happy to offer them a referral to

Re: [fossil-users] Veracity (was: Fwd: suggestion on fossil)

2011-10-20 Thread Konstantin Khomoutov
On Thu, 20 Oct 2011 17:28:27 +0200 jos van kesteren wrote: [...] >>> Even that is not necessarily true. You can't merge binary files >>> like text files -- sure. But it doesn't mean that for a specific >>> binary format, a merge algorithm isn't possible. Consider ODF >>> documents for a moment. A

Re: [fossil-users] Veracity (was: Fwd: suggestion on fossil)

2011-10-20 Thread dexen deVries
On Thursday 20 of October 2011 17:28:27 jos van kesteren wrote: > Since ODF documents can be unzipped, and their XML contents are text > anyway, why not make a commit program (instead of a merge program) that > unzips the ODF and > stores the XML in the repo ? that assumes merging /text/ of XML o

Re: [fossil-users] Veracity (was: Fwd: suggestion on fossil)

2011-10-20 Thread jos van kesteren
>> >> Date: Thu, 20 Oct 2011 01:45:30 +0200 >> From: Joerg Sonnenberger >> To: fossil-users@lists.fossil-scm.org >> Subject: Re: [fossil-users] Veracity (was: Fwd: suggestion on fossil) >> Message-ID: <20111019234530.gb10...@britannica.bec.de> >> Content-Type: text/plain; charset=us-ascii >> >> On

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Kohn Bernhard
Hi Gilles, it works. You just have to add a new submenu item with the same name but different File Type. To this submen you can add a item. http://imageshack.us/photo/my-images/830/fastexplorerfos.png best regards Bernhard -Ursprüngliche Nachricht- Von: fossil-users-boun...@lists.fo

Re: [fossil-users] Veracity

2011-10-20 Thread Jeff Slutter
On 10/20/2011 6:46 AM, Martin Gagnon wrote: > On 2011-10-20, at 01:13, Jeff Slutter wrote: > >> A couple weeks ago I posted about the possibility of a new configuration >> setting called something like "allow-binmerge" (default off). If it is >> enabled, and there is a gmerge-command set, could

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Gilles
On Thu, 20 Oct 2011 12:39:43 +0200, Kohn Bernhard wrote: >I have used the fast explorer to achieve a menu entry just beneath 7zip >explorer entry. You should try the Submenu Items selection on the left side of >fast explorer. >But I use only the type File Folder. That's why: It doesn't seem pos

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Kohn Bernhard
Hello Gilles > Actually, it's not that good because... > - it requires installing Fast Explorer > - it requires adding a fossil.bat just to call "pause" to keep the DOS box > open after fossil.exe exits > - "fossil gdiff --from previous myfile.txt" doesn't work because "%1%" > returns the full pa

Re: [fossil-users] Veracity

2011-10-20 Thread Martin Gagnon
On 2011-10-20, at 01:13, Jeff Slutter wrote: > A couple weeks ago I posted about the possibility of a new configuration > setting called something like "allow-binmerge" (default off). If it is > enabled, and there is a gmerge-command set, could Fossil call the > gmerge-command to resolve a bin

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Kohn Bernhard
Hello Tomek, you are right, this would be the best solution. But there exist a problem with shell extension and .net. As far as I know it is not officially supported by Microsoft. First they said, that with the .net Framework 4.0 it should be available, but it is not announced (but may be I am

Re: [fossil-users] Adding Fossil to Windows Explorer context menu?

2011-10-20 Thread Kohn Bernhard
Dear Gilles, I have used the fast explorer to achieve a menu entry just beneath 7zip explorer entry. You should try the Submenu Items selection on the left side of fast explorer. But I use only the type File Folder. Best regards Bernhard -Ursprüngliche Nachricht- Von: fossil-users-bo

[fossil-users] Merge with branch after a branch file was renamed causes mysterious behavior - possible bug?

2011-10-20 Thread Marty
This might be a bug: 1) Branch FooBranch and the trunk has a file named FooFile 2) FooFile gets renamed on the FooBranch to FooFileNew 3) A new file on FooBranch gets created, using the name FooFile 4) The FooBranch gets merged with the trunk 5) The merge status shows that FooFile was renamed to