Re: [fossil-users] missing branch tag (?)

2013-10-09 Thread B Harder
Matt - not a bad idea, though I'm not entirely sure where to proceed now. What I think (hope?) I have is two branches: trunk, and os_x os_x originally branched off trunk (as all things do, in some form or another). I've got an entry in os_x (an old one) where I can: fossil co [old os_x entry]

Re: [fossil-users] missing branch tag (?)

2013-10-09 Thread Matt Welland
I've had something similar happen before and was able to fix it by using the ui to "make a branch" trunk in several nodes along the trunk timeline until one of them worked. Try it disconnected do as not to mess up the original db. On Oct 9, 2013 3:26 PM, "B Harder" wrote: > I know what you're ta

Re: [fossil-users] missing branch tag (?)

2013-10-09 Thread B Harder
I know what you're talking about, but I'm not seeing the results I hope for. I've made a copy of the repo, and have teased out ea. commit/event SHA1. I've run on ea. SHA1 "fossil tag list --raw [sha1_id]" and collected that output[0]. The tags look like I'd expect (though I could be mistaken) and

Re: [fossil-users] missing branch tag (?)

2013-10-09 Thread Mark Janssen
Branches are controlled by propagating raw tags. Start with fossil tag list --raw checkin. Then I think you should be able to cancel the offending raw tag. On 9 Oct 2013 23:07, "B Harder" wrote: > ...and now I see the edit where the trunk tag was cancelled -- > question remains --- can I undo/rev

Re: [fossil-users] missing branch tag (?)

2013-10-09 Thread B Harder
...and now I see the edit where the trunk tag was cancelled -- question remains --- can I undo/reverse the effect? On 10/9/13, B Harder wrote: > It appears that somehow the branch tag was deleted on my [trunk]. > > Now, when I try to merge from trunk -> feature_branch, I get something > like: > >

[fossil-users] missing branch tag (?)

2013-10-09 Thread B Harder
It appears that somehow the branch tag was deleted on my [trunk]. Now, when I try to merge from trunk -> feature_branch, I get something like: $ fossil merge trunk WARNING - no common ancestor: filea.c WARNING - no common ancestor: fileb.c WARNING - no common ancestor: filec.c ... ADDED src/othe

[fossil-users] SSH transport changes merged.

2013-10-09 Thread Andy Bradford
Hello, The changes for the SSH transport have been merged into trunk (thanks Richard). This change primarily does away with shell interaction and simply runs: ssh user@remote fossil test-http /path/to/fossil.fossil Please report any problems. Thanks, Andy -- TAI64 timestamp: 400052

Re: [fossil-users] typo in docu

2013-10-09 Thread Stephan Beal
On Wed, Oct 9, 2013 at 3:44 PM, j. van den hoff wrote: > The password for 'nobody' is ignore. > > > which is probably not the intended meaning ... (missing `d' at the end of > sentence). Fixed! Thanks! i only saw that one instance. If there's another, please point it out. -- - stephan bea

[fossil-users] typo in docu

2013-10-09 Thread j. van den hoff
on pages like {http://url_of_repo}/setup_uedit?id=3 in the "special logins" section it reads: The password for 'nobody' is ignore. which is probably not the intended meaning ... (missing `d' at the end of sentence). -- Using Opera's revolutionary email client: http://www.opera.com/mail/

Re: [fossil-users] chosen project name might interfere with tar/zip download

2013-10-09 Thread j. van den hoff
On Tue, 08 Oct 2013 16:44:55 +0200, Richard Hipp wrote: The latest trunk has (yet another) configuration option that allows you to specify the name prefix for generated tarballs and ZIP archives. If the "Abbreviated Name" is omitted, the Project Name is used. a minor thing, but still -- I