Re: For devs: commit only to devel, except maybe branches.md

[Edward K. Ream]

On Fri, Mar 2, 2018 at 9:27 PM, Matt Wilkie  wrote:
​​

Generally speaking I should usually be the only one committing to master.
>> And that should happen only when merging a release branch into master.
>>
>
​Vitalije and I agree that there are reasons for committing to master.  See
my previous comment on this thread.​



> https://github.com/leo-editor/leo-editor/settings/branches has settings
>> for specifying the default branch and marking branches as protected (limit
>> who's allowed to push, require signing, etc.). I haven't used any of these,
>> but it looks useful for what we're talking about.
>>
>
​I played with those settings yesterday.  ​master is now a protected
branch, which basically means that push --force is not allowed. There are
additional access restrictions, but those don't seem to matter much.

Forbidding --force is a good thing, but now master does not show up on Leo's
active branches page
. Not sure why.
It does show up on the all branches page
. As you can see,
there is a padlock besides the master branch.

I also considered changing the default branch to devel, but when I started
to do that a big red warning dialog said that doing so might have severe
unintended consequences.  So I didn't ;-)

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Re: For devs: commit only to devel, except maybe branches.md

[Edward K. Ream]

On Fri, Mar 2, 2018 at 8:19 PM, vitalije  wrote:

​> ​
What about fixing bugs? Should they also go to devel?

​Heh.  I was just going to write about this. Reminds me of this joke:

​​
In theory, theory and practice are the same thing. In practice they're
different.

​> ​
I have committed recently a fix for the bug that nobody has reported yet,
but which has caused me some data loss.

​Your bug fix was what got me thinking.
Imo, you did the right thing.  Iirc, I merged master into devel shortly
thereafter.


The problem with committing anywhere *except* master is that it doesn't fix
master :-)

There are two problems with committing only in master:

1. It doesn't follow the expected development pattern.
2. Devs won't routinely test the fix when they use anything in devel or
based on devel.

Imo, the solution is to commit urgent fixes to master *and* devel, by
committing to master and then merging master into devel.  Of course, all
unit tests should pass in master before committing, but that's also true
for committing to devel.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Re: For devs: commit only to devel, except maybe branches.md

[Matt Wilkie]

> Generally speaking I should usually be the only one committing to master.  
> And that should happen only when merging a release branch into master.
>

https://github.com/leo-editor/leo-editor/settings/branches has settings for 
specifying the default branch and marking branches as protected (limit 
who's allowed to push, require signing, etc.). I haven't used any of these, 
but it looks useful for what we're talking about.

matt



-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Re: For devs: commit only to devel, except maybe branches.md

[vitalije]

What about fixing bugs? Should they also go to devel? I have committed 
recently a fix for the bug that nobody has reported yet, but which has 
caused me some data loss. 

On Saturday, March 3, 2018 at 12:34:24 AM UTC+1, Edward K. Ream wrote:
>
> Generally speaking I should usually be the only one committing to master.  
> And that should happen only when merging a release branch into master.
>
> However, committing branches.md in master is harmless.  You can then 
> merge master into devel.  
>
> *Not the other way!*Edward
>

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

For devs: commit only to devel, except maybe branches.md

[Edward K. Ream]

Generally speaking I should usually be the only one committing to master.  
And that should happen only when merging a release branch into master.

However, committing branches.md in master is harmless.  You can then merge 
master into devel.  

*Not the other way!*Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.