Re: [escet-dev] Remove install.asciidoc.org?

["Beek, Bert van" <D.A.v.Beek@xxxxxx>]

Hi Dennis, I had indeed just read it, but your explanation about the main two options to deal with merge requests from your previous mail is not in the development process. At least I did not find it there. Perhaps add it?

Bert

> On 18 Mar 2021, at 09:58, Dennis Hendriks <dh_tue@xxxxxxxxxxx> wrote:
> 
> Hi Bert,
> 
> Our development process is explained here: https://www.eclipse.org/escet/escet/#developer-development-process-chapter-index
> 
> Dennis
> 
> Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Dennis Hendriks <dh_tue@xxxxxxxxxxx>
> Verzonden: donderdag 18 maart 2021 09:57
> Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
> Onderwerp: Re: [escet-dev] Remove install.asciidoc.org?
>  
> Hi Bert,
> 
> The 2 main options:
> 	• Create a merge request and branch at once, from the issue. It will be a 'Draft' merge request. Once all the work is done, change the status, removing the 'Draft' status.
> 	• Create the branch from the issue (and only the branch). Once all the work is done, create a merge request for the branch.
> The 1st option leads to more mails, as every commits leads to a mail. For the 2nd option, you only get mails once the merge request is created, and it is thus in review.
> 
> Therefore I prefer the first option.
> 
> Dennis
> 
> Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Beek, Bert van <D.A.v.Beek@xxxxxx>
> Verzonden: donderdag 18 maart 2021 09:51
> Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
> Onderwerp: Re: [escet-dev] Remove install.asciidoc.org?
>  
> Thanks Dennis, I see now what went wrong. What is the preferred way of working to avoid this from occurring?
> 
> > On 18 Mar 2021, at 09:23, Dennis Hendriks <dh_tue@xxxxxxxxxxx> wrote:
> > 
> > Hi Bert,
> > 
> > Indeed, you first created a branch without merge request, and then a merge request and branch together (the '...-2' one). You commited to the first branch.
> > 
> > You can create a merge request now on the first branch. See 'New merge request' button athttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests.
> > 
> > Then close the 2nd merge request. At https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/23, select the arrow next to 'Mark as ready' and choose 'Close merge request' from the drop down.
> > 
> > Then manually remove the '...-2' branch. At https://gitlab.eclipse.org/eclipse/escet/escet/-/branches select the red remove button to the right of the branch. Make sure not to remove the wrong branch!
> > 
> > Dennis
> > 
> > 
> > Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Martijn Goorden <mgoorden@xxxxxxxxx>
> > Verzonden: donderdag 18 maart 2021 09:14
> > Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
> > Onderwerp: Re: [escet-dev] Remove install.asciidoc.org?
> >  
> > I see the issue. There are two branches starting with “21-improve-…” While you committed the changes to one of them, the merge request is on the second one (ending with “-2”).
> >  
> > From: escet-dev <escet-dev-bounces@xxxxxxxxxxx> on behalf of "Beek, Bert van" <D.A.v.Beek@xxxxxx>
> > Reply to: escet developer discussions <escet-dev@xxxxxxxxxxx>
> > Date: Thursday, 18 March 2021 at 09.06
> > To: escet developer discussions <escet-dev@xxxxxxxxxxx>
> > Subject: Re: [escet-dev] Remove install.asciidoc.org?
> >  
> > I see them here: 
> >  
> > <image001.png>
> > 
> > 
> > On 18 Mar 2021, at 08:59, Martijn Goorden <mgoorden@xxxxxxxxx> wrote:
> > 
> > Hi Bert,
> > 
> > I see that the branch doesn't contain any commits pushed to the server. Therefore, it can't identify any changes.
> > 
> > Martijn
> > 
> > On 18/03/2021, 08.47, "escet-dev on behalf of Beek, Bert van" <escet-dev-bounces@xxxxxxxxxxx on behalf of D.A.v.Beek@xxxxxx> wrote:
> > 
> >    I have just committed the update to the installation instructions in the new branch 21-improve-installation-intructions-for-macos and pushed and then created a merge request. However, the merge request says: "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.” What am I missing?
> > 
> >    Bert
> > 
> > 
> > On 18 Mar 2021, at 00:00, Beek, Bert van <D.A.v.Beek@xxxxxx> wrote:
> > 
> > I have not yet committed anything, on purpose, waiting for the decision on the command line utilities, which also affects the manual. Sorry about the install.asciidoc.org question. Stupid question, I think I created the file myself, so obviously I should delete it before committing.
> > 
> > Bert
> > 
> > 
> > On 17 Mar 2021, at 17:31, Dennis Hendriks <dh_tue@xxxxxxxxxxx> wrote:
> > 
> > 
> > I see the branch you created on the GitLab server. I don't see any commits. Seehttps://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.eclipse.org%2Feclipse%2Fescet%2Fescet%2F-%2Fcommits%2F21-improve-installation-instructions-for-macos&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203724407%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=LrvJkOB%2BdhnGQEZry93Hfrz3l%2BTWEwWOBCc4jX2HxjY%3D&amp;reserved=0. Maybe you committed locally but didn't push it to the remote yet? So I'm not sure yet what you mean with install.asciidoc.org as I can't see you changes yet.
> > 
> > Dennis
> > 
> > Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Beek, Bert van <D.A.v.Beek@xxxxxx>
> > Verzonden: woensdag 17 maart 2021 17:25
> > Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
> > Onderwerp: [escet-dev] Remove install.asciidoc.org?
> > 
> > I have created a branch to update the macOS installation instructions via Gitlab and I noticed that Gitlab has added the original version of the updated manual as install.asciidoc.org. What I do with this file when committing my changes, do I delete thisnewinstall.asciidoc.org file?
> > 
> > Bert
> > _______________________________________________
> > escet-dev mailing list
> > escet-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203724407%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=sjBIuOgZFdSO3HC0KVvW3qXcTnScVjGqFe31guWluO8%3D&amp;reserved=0
> > _______________________________________________
> > escet-dev mailing list
> > escet-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203724407%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=sjBIuOgZFdSO3HC0KVvW3qXcTnScVjGqFe31guWluO8%3D&amp;reserved=0
> > _______________________________________________
> > escet-dev mailing list
> > escet-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203724407%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=sjBIuOgZFdSO3HC0KVvW3qXcTnScVjGqFe31guWluO8%3D&amp;reserved=0
> > 
> >    _______________________________________________
> >    escet-dev mailing list
> >    escet-dev@xxxxxxxxxxx
> >    To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> >    https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203734365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=OWeWU3rY4tiv182CJU3nhTLe3J%2FDWrFKvH18%2BVAMQyg%3D&amp;reserved=0
> > 
> > _______________________________________________
> > escet-dev mailing list
> > escet-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data=04%7C01%7C%7C795b2aa369a8446cc6d508d8e9e3df34%7Ccc7df24760ce4a0f9d75704cf60efc64%7C1%7C0%7C637516512203734365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=OWeWU3rY4tiv182CJU3nhTLe3J%2FDWrFKvH18%2BVAMQyg%3D&amp;reserved=0
> >  
> > _______________________________________________
> > escet-dev mailing list
> > escet-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> > https://dev.eclipse.org/mailman/listinfo/escet-dev
> 
> _______________________________________________
> escet-dev mailing list
> escet-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/escet-dev
> _______________________________________________
> escet-dev mailing list
> escet-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/escet-dev