On Tue, Mar 20, 2012 at 10:11, Jeremy Anderson wrote:
> Thanks, Leo. You just solved my problem!
>
> The password I was using began with a hash symbol ('#')... adding an
> additional # (##[password]) got it to work.
>
> Is it just me, or is putting special tokens like that in the password a bad
>
On Tue, Mar 20, 2012 at 09:57, Richard Hipp wrote:
>
> Why not just "fossil revert my/file.txt"?
>
For each one of dozens of files in the manifest??
I tried
$ fossil revert
and it reverts the contents of all files but at the same time it also removes
merge record (clears vmerge table).
All I w
Brilliant. that did it. Disregard my last. :)
On Tue, Mar 20, 2012 at 8:54 AM, Benoit Mortgat wrote:
> On Tue, Mar 20, 2012 at 16:51, Benoit Mortgat wrote:
> > On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson
> wrote:
> >> I know Fossil is a file versioning system, but when first establishing a
Sounds like a winning suggestion. Having issues with it though.
specifying \developer\jer results in:
c:\fossil\fossil.exe: couldn't create directory \developer\jer as required
by empty-dirs setting
specifying /developer/jer results in:
c:\fossil\fossil.exe: couldn't create directory /developer/j
On Tue, Mar 20, 2012 at 16:51, Benoit Mortgat wrote:
> On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson wrote:
>> I know Fossil is a file versioning system, but when first establishing a
>> repository for a working group, it is useful to create a straw-man folder
>> structure to guide growth. But,
On Tue, Mar 20, 2012 at 16:28, Jeremy Anderson wrote:
> I know Fossil is a file versioning system, but when first establishing a
> repository for a working group, it is useful to create a straw-man folder
> structure to guide growth. But, one can't (by default?) commit an empty
> folder to a fossi
On 20/03/2012, at 16:28, Jeremy Anderson wrote:
> I know Fossil is a file versioning system, but when first establishing a
> repository for a working group, it is useful to create a straw-man folder
> structure to guide growth. But, one can't (by default?) commit an empty
> folder to a fos
I know Fossil is a *file* versioning system, but when first establishing a
repository for a working group, it is useful to create a straw-man folder
structure to guide growth. But, one can't (by default?) commit an empty
folder to a fossil repository, as there's nothing to 'version'.
For example,
If anyone needs a statically compiled x86_64 binary:
-rwxr-xr-x 1 root root 1830728 Mar 20 11:05 /usr/bin/fsl
It was compiled with GCC 4.6.2 and Musl. Compile options:
https://github.com/tongson/Gimokod/blob/7296c5b381994a06b0a13bd6445833f13426910c/core/fsl/PKGBUILD
___
Because I was confusing “ours” and “their”.
On Tue, Mar 20, 2012 at 14:57, Richard Hipp wrote:
>
>
> On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat wrote:
>>
>> The simplest way to let merge conflicts happen, and
>> restore versions from an older commit if you know the file artifact ids:
>>
>>
Thanks, Leo. You just solved my problem!
The password I was using began with a hash symbol ('#')... adding an
additional # (##[password]) got it to work.
Is it just me, or is putting special tokens like that in the password a bad
idea? :)
On Tue, Mar 20, 2012 at 4:03 AM, Leo Razoumov wrote:
>
I should have mentioned that as well. I get the same error either way. :)
I started with that method and migrated to the http://user:pwd@... approach
when I needed to double-check my password for correctness.
On Tue, Mar 20, 2012 at 5:22 AM, Richard Hipp wrote:
>
>
> On Tue, Mar 20, 2012 at 2:1
On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat wrote:
> The simplest way to let merge conflicts happen, and
> restore versions from an older commit if you know the file artifact ids:
>
> fossil artifact a59bd2322 > my/file.txt
>
Why not just "fossil revert my/file.txt"?
>
> On Tue, Mar 20, 20
The simplest way to let merge conflicts happen, and
restore versions from an older commit if you know the file artifact ids:
fossil artifact a59bd2322 > my/file.txt
On Tue, Mar 20, 2012 at 14:14, Leo Razoumov wrote:
> Hi there,
> GIT has a useful merge strategy "git merge -s ours" that always
>
> Depending on if your files fit a nice set of patterns you may want to
> consider using ignore-glob to keep from seeing your irrelevant files. The
> methodology I encourage on our team is that a "fossil extras" should
> always be clean, i.e. there should be no extras.
That sounds like a good idea
Hi there,
GIT has a useful merge strategy "git merge -s ours" that always
chooses our current version over the version being merged in. The
resulting merge has exactly the same files contents as its base
parent. The only difference being that the commit merged in is now
added to the list of merge p
> > To see the list of "unmanaged" files:
> Thank you. It is more "manual" than I was looking for but if that's the way
> it works that's the way it works.
>
> Beware of any program that thinks it knows more than you do.
>
>--
>D. Richard Hipp
Point taken, but that isn't what I've been wondering
On Tue, Mar 20, 2012 at 6:19 AM, ST wrote:
> Hi,
> 1) I've just configured my first fossil repo and now would like to copy
> this configuration to other projects. Is it possible?
> Most problematic part is enabling "assigned_to" and "opened_by" in
> tickets as per this:
> http://fossil-scm.org/in
On Tue, Mar 20, 2012 at 2:12 AM, Jeremy Anderson wrote:
> Hey everyone. Need a little help...
>
I don't have any good ideas of why this isn't working
But just for grins, try entering just the username in the URL and let
Fossil prompt you for the password. Maybe there is some bug in the
MBC
On Tue, Mar 20, 2012 at 02:12, Jeremy Anderson wrote:
> Hey everyone. Need a little help...
>
> Problem:
> Attempting to clone a recently-created repository gives this error:
>
> D:\f\repo>fossil clone
> http://user:p...@ec2-xxx.compute.amazonaws.com:6969/hekate
> d:\f\repo\hekate.fossil
>
Could
On 03/20/2012 12:19 PM, ST wrote:
> Hi,
> 1) I've just configured my first fossil repo and now would like to copy
> this configuration to other projects. Is it possible?
Hello -
It is simple: do "fossil help config" for all the options, but you
basically want "fossil config export" and "fossil co
Hi,
1) I've just configured my first fossil repo and now would like to copy
this configuration to other projects. Is it possible?
Most problematic part is enabling "assigned_to" and "opened_by" in
tickets as per this:
http://fossil-scm.org/index.html/doc/trunk/www/custom_ticket.wiki . Why
isn't it
22 matches
Mail list logo
