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

2017-07-14 Thread 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?

2017-07-14 Thread 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?

2017-07-14 Thread 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?

2017-07-14 Thread 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?

2017-07-14 Thread 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?

2017-07-14 Thread 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