Re: [fossil-users] How to close an empty branch?

[Warren Young]

On Oct 23, 2015, at 11:32 PM, Andy Bradford  wrote:
> 
> Thus said Warren Young on Fri, 23 Oct 2015 17:35:38 -0600:
> 
>> I don't see how to do it from the command line.
> 
> Have you tried ``fossil amend'' yet?

No.  My eyes slid right over that when looking for a suitable command.

I managed to pass the amendment with a 2/3 majority using the following command 
sequence:

   mkdir ~/bogus-branch
   cd ~/bogus-branch
   f open ~/museum/repo.fossil bogus-branch
   f stat
   f amend 146e8e638db2536ca83b271cf6efe12b6cc99b81 --close

The “stat” command was necessary because I needed to get the UUID of the tip of 
the bogus branch, which I couldn’t get from the UI.

Interestingly, after opening that bogus branch in a new checkout directory, I 
ended up with no files except for .fslckout.

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

Re: [fossil-users] How to close an empty branch?

[Warren Young]

On Oct 24, 2015, at 6:57 AM, Richard Hipp  wrote:
> 
> On 10/23/15, Warren Young  wrote:
>> 
>> For some reason, that long history includes a branch that has no checkins,
> 
> How is that even possible in Fossil?

That’s why I mentioned the repo’s long and tangled history.  The bogus branch 
was created about 10 years ago, which means it might have been while we were 
still using CVS at the time.  If we’d switched to SVN by then, it wasn’t all 
that long after the switch.

Anyway, the SVN-to-Fossil-via-Git process preserved that bogus branch, and 
Fossil accepted it on import.

I have no idea how to replicate it, since it happened so long ago.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] How to close an empty branch?

[Warren Young]

On Oct 26, 2015, at 1:56 PM, Warren Young  wrote:
> 
> The “stat” command was necessary because I needed to get the UUID of the tip 
> of the bogus branch, which I couldn’t get from the UI.

Looking back on the terminal log, I see that I could have gotten the UUID from 
the output of “fossil open.”  Oh, well.

I also did a “fossil sync”, for what that’s worth.  I’m not absolutely sure it 
was necessary, but it looks like amend doesn’t autosync.  I’ve seen that with 
other commands.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] A branch that won't go away ...

[Matt Welland]

That was it. There was a very old branch that we missed. Thanks!
On Oct 24, 2015 5:56 AM, "Richard Hipp"  wrote:

> On 10/23/15, Matt Welland  wrote:
> > We have a fossil with a branch that was closed over a year ago where the
> > closed branch is showing up in the "fossil branch" list. I tried a few
> > experiments, opening and closing the branch, rebuilding the repo,
> > re-cloning etc. and that dang branch continues to show up in the command
> > line listing BUT it shows as closed in the ui branch list. (Aside: I miss
> > the ability to show only closed or open branches as we have lots of
> > branches).
> >
>
> Perhaps the branch has two or more tips, and not all of the tips are
> closed.  IIRC, the overall branch is only shown as closed if *all*
> tips are marked closed.
>
> --
> D. Richard Hipp
> d...@sqlite.org
> ___
> 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

Re: [fossil-users] Error synchronizing private check-ins

[Mikhail Kryshen]

The error is still reproducible in current trunk [a6b999ce13].

Tokujo Echsula  writes:

> Here's an easy way to reproduce it:
>
> fossil new 1.fossil
> fossil open 1.fossil
> echo > a.file
> fossil addremove
> fossil commit -m "private" --private
> fossil clone 1.fossil 2.fossil
> fossil pull -R 2.fossil --private

Pull from file:///home/mikhail/fossil-test/1.fossil
Round-trips: 2   Artifacts sent: 0  received: 0
SQLITE_CONSTRAINT: abort at 8 in [INSERT INTO private VALUES(2)]: UNIQUE 
constraint failed: private.rid
fossil: UNIQUE constraint failed: private.rid: {INSERT INTO private VALUES(2)}

$ fossil version
This is fossil version 1.34 [a6b999ce13] 2015-10-26 01:18:10 UTC

> On Wed, Apr 15, 2015 at 6:26 PM, Mikhail Kryshen 
> wrote:
>
>> The problem reproduces with fossil built from the current trunk (abef6cf7).
>>
>> Mikhail Kryshen  writes:
>>
>> > Hello,
>> >
>> > I encountered a problem trying to transfer private check-ins between
>> > personal clones of a repository:
>> >
>> > $ fossil pull --private --once ssh://host/fossils/project.fossil
>> > Round-trips: 2   Artifacts sent: 0  received: 0
>> > SQLITE_CONSTRAINT: abort at 8 in [INSERT INTO private VALUES(10049)]:
>> UNIQUE constraint failed: private.rid
>> > fossil: UNIQUE constraint failed: private.rid: {INSERT INTO private
>> VALUES(10049)}
>> >
>> > This also happens with a newly created repository: сreate a repo
>> > (test.fossil), open it, add a file, commit, make changes, commit
>> > with --private, then
>> >
>> > $ fossil clone test.fossil test-clone.fossil
>> > ... (no errors)
>> >
>> > $ fossil pull --private test.fossil -R test-clone.fossil
>> > Round-trips: 2   Artifacts sent: 0  received: 0
>> > SQLITE_CONSTRAINT: abort at 8 in [INSERT INTO private VALUES(6)]: UNIQUE
>> constraint failed: private.rid
>> > fossil: UNIQUE constraint failed: private.rid: {INSERT INTO private
>> VALUES(6)}
>> >
>> > $ fossil push --private test-clone.fossil -R test.fossil
>> > Round-trips: 2   Artifacts sent: 6  received: 0
>> > Error: Database error: UNIQUE constraint failed: private.rid: {INSERT
>> INTO private VALUES(6)}
>> > Round-trips: 2   Artifacts sent: 6  received: 0
>> > Push done, sent: 1283  received: 669  ip:
>> >
>> > $ fossil sync --private test-clone.fossil -R test.fossil
>> > Round-trips: 2   Artifacts sent: 2  received: 0
>> > Error: Database error: UNIQUE constraint failed: private.rid: {INSERT
>> INTO private VALUES(6)}
>> > Round-trips: 2   Artifacts sent: 2  received: 0
>> > Sync done, sent:   received: 804  ip:
>> >
>> > $ fossil version
>> > This is fossil version 1.32 [6c40678e91] 2015-03-14 13:20:34 UTC
>>
>> --
>> Mikhail
>>
>> ___
>> 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

-- 
Mikhail


signature.asc
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users