Re: [fossil-users] Test message after IP address change

[Andy Bradford]

Thus said Richard Hipp on Wed, 12 Jul 2017 06:25:56 -0400:

> There are reports that messages are  not getting throught to this list
> now. The current message is an attempt to reproduce the problem.

This is a reply to verify.

Andy
-- 
TAI64 timestamp: 400059699f27


___
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] Help messages in add.c

[Venkat Iyer]

Consider me old fashioned,  but the current behavior seems more in line with
traditional unix (read sysv) commands.   Usage is when when the user made
an error or explicitly asked for help. The question would then be:

Is "fossil cat" followed by

a) zero or more paths
b) one or more paths

I script fossil more (or use it through emacs vc) than use it command line.

I currently assume a).But it wouldn't kill me if b) became the
default.  My
scripts will have to not exec fossil for no filenames.

-Venkat





On Fri, Jul 14, 2017 at 12:56 AM, Johan Kuuse  wrote:

> On Thu, Jul 13, 2017 at 6:31 PM, jungle Boogie 
> wrote:
> > On 6 June 2017 at 06:50, Johan Kuuse  wrote:
> >> Hi,
> >>
> >> The following commands, executed without any arguments, are mute:
> >>
> >> f add
> >> f rm
> >> f delete
> >> f forget
> >>
> >> IMHO, they should show a help message instead.
> >>
> >
> > Is it desired to not do anything with the command isn't followed by a
> > filename/argument?
> >
>
> I cannot I think of any situation where it should be desired not
> showing the help message.
> It's just a matter about being coherent, either you show a help
> message, or you don't.
> An example:
>
> The file src/add.c contains both the commands 'add' and 'mv' (among
> others).
>
> fossil add
> (no output)
>
> fossil mv
> Usage: fossil mv OLDNAME NEWNAME
>
>
> Just discovered that the following commands behave the same (no help
> message):
> f cat
> f sha1
> f sha3
>
> The two last commands may read from stdin, but even so, they require
> at least 1 argument, '-'.
>
>
>
> Index: src/add.c
> ==
> --- src/add.c
> +++ src/add.c
> @@ -298,10 +298,13 @@
>if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL;
>
>/* We should be done with options.. */
>verify_all_options();
>
> +  if( g.argc<3 ){
> +usage("FILE...");
> +  }
>db_must_be_within_tree();
>if( zCleanFlag==0 ){
>  zCleanFlag = db_get("clean-glob", 0);
>}
>if( zIgnoreFlag==0 ){
>
>
>
>
> BR,
> Johan
>
>
> >> Best Regards,
> >> Johan
> > ___
> > 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
>
>
___
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 move a check-in from a branch to another one?

[jungle Boogie]

On 14 July 2017 at 08:21, Richard Hipp  wrote:
> On 7/14/17, jungle Boogie  wrote:
>>
>> The command to edit commits after they've been commited is amend:
>> https://www.fossil-scm.org/index.html/help?cmd=amend
>>
>> example:
>> fosisl amend abc123 --tag fossiliscool
>>
>>
>> As you see, that command allows you to edit quite a bit from the
>> command line after a commit happened.
>>
>
> But amend will not move a check-in to a different branch.  All amend
> can do is change tags.  Moving a check-in to a different branch
> fundamentally changes the check-in.

Ah, right you are!

>
> Reparenting won't work either.  Reparenting just changes the ancestors
> of the check-in.  It does not change the content of the check-in so
> that it contains the desired content from the other branch where it
> was suppose to occur in the first place.
>
> Cherrypicking the check-in over to the correct branch is the only way
> to do this.
>

All good points.

Sorry to have added confusion to this.

>
> --
> D. Richard Hipp
> d...@sqlite.org


-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
___
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 move a check-in from a branch to another one?

[Richard Hipp]

On 7/14/17, jungle Boogie  wrote:
>
> The command to edit commits after they've been commited is amend:
> https://www.fossil-scm.org/index.html/help?cmd=amend
>
> example:
> fosisl amend abc123 --tag fossiliscool
>
>
> As you see, that command allows you to edit quite a bit from the
> command line after a commit happened.
>

But amend will not move a check-in to a different branch.  All amend
can do is change tags.  Moving a check-in to a different branch
fundamentally changes the check-in.

Reparenting won't work either.  Reparenting just changes the ancestors
of the check-in.  It does not change the content of the check-in so
that it contains the desired content from the other branch where it
was suppose to occur in the first place.

Cherrypicking the check-in over to the correct branch is the only way
to do this.


-- 
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

Re: [fossil-users] How to move a check-in from a branch to another one?

[jungle Boogie]

On 14 July 2017 at 03:21, Richard Hipp  wrote:
> On 7/14/17, Olivier R.  wrote:
>> So what is the recipe to move a check-in to another branch?
>
> I (the original author of Fossil) always use web-based UI for this.
> First run "fossil ui" to get the web interface going.  Then find the
> check-in you want to move and click on its link to get to the "/info"
> page.  There is an "Edit" option beside "Other Links:".  Click on the
> Edit option.  On the /ci_edit page, there is a check box "Make this
> check-in the start of a new branch named:".  Enter the name of the new
> branch and click on the box and press "Apply Changes".
>
> There is a way to do this from the command-line, but I never use it
> and so I don't remember what it is.

The command to edit commits after they've been commited is amend:
https://www.fossil-scm.org/index.html/help?cmd=amend

example:
fosisl amend abc123 --tag fossiliscool


As you see, that command allows you to edit quite a bit from the
command line after a commit happened.


> --
> D. Richard Hipp
> d...@sqlite.org


-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
___
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 move a check-in from a branch to another one?

[Olivier R.]

Le 14/07/2017 à 13:55, Richard Hipp a écrit :


fossil update trunk
fossil merge --cherrypick $branch
... test
fossil commit


Thank you.

Olivier

___
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 move a check-in from a branch to another one?

[Richard Hipp]

On 7/14/17, Olivier R.  wrote:
> Le 14/07/2017 à 12:21, Richard Hipp a écrit :
>> On 7/14/17, Olivier R.  wrote:
>>> So what is the recipe to move a check-in to another branch?
>>
>> I (the original author of Fossil) always use web-based UI for this.
>> First run "fossil ui" to get the web interface going.  Then find the
>> check-in you want to move and click on its link to get to the "/info"
>> page.  There is an "Edit" option beside "Other Links:".  Click on the
>> Edit option.  On the /ci_edit page, there is a check box "Make this
>> check-in the start of a new branch named:".  Enter the name of the new
>> branch and click on the box and press "Apply Changes".
>
> Thanks for the answer.
>
> I’m afraid I haven’t been explicit enough.
>
> When I committed, I though I was in trunk, but I was in another branch.
> I want to move the check-in from this branch to trunk…
>

fossil update trunk
fossil merge --cherrypick $branch
... test
fossil commit

-- 
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

Re: [fossil-users] How to move a check-in from a branch to another one?

[Richard Hipp]

On 7/14/17, Olivier R.  wrote:
> So what is the recipe to move a check-in to another branch?

I (the original author of Fossil) always use web-based UI for this.
First run "fossil ui" to get the web interface going.  Then find the
check-in you want to move and click on its link to get to the "/info"
page.  There is an "Edit" option beside "Other Links:".  Click on the
Edit option.  On the /ci_edit page, there is a check box "Make this
check-in the start of a new branch named:".  Enter the name of the new
branch and click on the box and press "Apply Changes".

There is a way to do this from the command-line, but I never use it
and so I don't remember what it is.
-- 
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] How to move a check-in from a branch to another one?

[Olivier R.]

Hello everyone,

On this page

we can read:
“Fossil keeps all check-ins on a single DAG. Branches are identified 
with tags. This means that check-ins can be freely moved between 
branches simply by altering their tags.”


So I tried, and failed.
I simply removed the wrong tag and added the good one.
The result was strange, and as I feared to have messed up the repo, I 
deleted it and cloned from a clean one.


It seems unadvised to use the command reparent.
So what is the recipe to move a check-in to another branch?

Thanks.

Olivier
___
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] Help messages in add.c

[Johan Kuuse]

On Thu, Jul 13, 2017 at 6:31 PM, jungle Boogie  wrote:
> On 6 June 2017 at 06:50, Johan Kuuse  wrote:
>> Hi,
>>
>> The following commands, executed without any arguments, are mute:
>>
>> f add
>> f rm
>> f delete
>> f forget
>>
>> IMHO, they should show a help message instead.
>>
>
> Is it desired to not do anything with the command isn't followed by a
> filename/argument?
>

I cannot I think of any situation where it should be desired not
showing the help message.
It's just a matter about being coherent, either you show a help
message, or you don't.
An example:

The file src/add.c contains both the commands 'add' and 'mv' (among others).

fossil add
(no output)

fossil mv
Usage: fossil mv OLDNAME NEWNAME


Just discovered that the following commands behave the same (no help message):
f cat
f sha1
f sha3

The two last commands may read from stdin, but even so, they require
at least 1 argument, '-'.



Index: src/add.c
==
--- src/add.c
+++ src/add.c
@@ -298,10 +298,13 @@
   if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL;

   /* We should be done with options.. */
   verify_all_options();

+  if( g.argc<3 ){
+usage("FILE...");
+  }
   db_must_be_within_tree();
   if( zCleanFlag==0 ){
 zCleanFlag = db_get("clean-glob", 0);
   }
   if( zIgnoreFlag==0 ){




BR,
Johan


>> Best Regards,
>> Johan
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Index: src/add.c
==
--- src/add.c
+++ src/add.c
@@ -298,10 +298,13 @@
   if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL;
 
   /* We should be done with options.. */
   verify_all_options();
 
+  if( g.argc<3 ){
+usage("FILE...");
+  }
   db_must_be_within_tree();
   if( zCleanFlag==0 ){
 zCleanFlag = db_get("clean-glob", 0);
   }
   if( zIgnoreFlag==0 ){

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