[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fossil-users
Subject:    Re: [fossil-users] Error on commit
From:       Scott Doctor <scott () scottdoctor ! com>
Date:       2018-03-26 22:27:20
Message-ID: d5f22eb9-ea43-6ae5-3f6a-d50df828b223 () scottdoctor ! com
[Download RAW message or body]


That worked. According to the changes command, 136 history files 
removed, 81 new history files added, and 22 files were edited. 
The commit completed without error this time. So I guess I will 
make a batch file to do those three commands for when I do a commit.

-------------------------
Scott Doctor
scott@scottdoctor.com
-------------------------

On 3/26/2018 15:18, Richard Hipp wrote:
> On 3/26/18, Scott Doctor <scott@scottdoctor.com> wrote:
>> I ran the stash command and got the following:
>>
>> no such file: D/water/C/slave/__history/main.c.~15~
> Probably this mean that you previously committed the file main.c.~15~
> but it was subsequently deleted without you doing "fossil rm".
>
> If you want to check-in an *exact* copy of the directory hierarchy as
> it stands now, try this:
>
>       fossil addremove
>       fossil changes        -- to see what it is you are about to do
>       fossil commit
>
> The "addremove" command looks through your directory hierarchy and
> does the equivalent of "fossil add" for every file it finds that is
> not currently under control, and "fossil rm" for every file that is
> under control that is now missing.
>
> Is that what you are trying to accomplish?
>
>> I am writing code for several Atmel (now Microchip) sam4s Arm
>> processora using Atmel Studio IDE. This is built on Microsloths
>> Visual Studio. The system automatically makes many history
>> sub-folders throughout the project directory tree.
>>
>> So it appears that when I created the repository there were
>> these history folders which commited transient files that no
>> longer exist, are hidden, and are read-only.
>>
>> So how do I handle a dynamic system of ever changing history
>> files that are all over the directory tree? Any time I open a
>> file to edit in some subfolder, the IDE creates a hidden
>> sub-folder in that directory to store the history. A quick look
>> around I found 36 of these.
>>
>> I have no need for these history files to be in the fossil
>> repository, but the folders are also transient. ugh.
>>
>> This is a reason why I would like to be able to
>> add/delete/commit.... from the gui. The tree is too complicated
>> and too many unknown folders to navigate from the command line.
>>
>>
>> -------------------------
>> Scott Doctor
>> scott@scottdoctor.com
>> -------------------------
>>
>> On 3/26/2018 13:47, Richard Hipp wrote:
>>> On 3/26/18, Scott Doctor <scott@scottdoctor.com> wrote:
>>>> I just typed:
>>>>
>>>> fossil commit
>>>>
>>>> All I wanted to do was take a snapshot of the current state in
>>>> case I wanted to back out of my changes after my forthcoming
>>>> edit session. Am I doing this wrong?
>>> You seem to be doing it right.  I don't know what the problem might be.
>>>
>>> If you tried running "fossil stash" instead?
>> _______________________________________________
>> fossil-users mailing list
>> fossil-users@lists.fossil-scm.org
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>>
>

_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[prev in list] [next in list] [prev in thread] [next in thread]