Branch "next" garbled

Branch "next" garbled

[Marco Wahl]

Hello fellow Orgers,

This is more an internal issue about the repo and in particular the
"next" branch.

My git fu was not strong enough and so the "next" branch is a bit messy
right now.  (I tried to activate a local clean version of the "next"
branch.)

I thought I could easily rollback the mess I created by going back to
the git node 3c8fd4fa7 which is the last git node before my activities.

The command I used is

    git revert 3c8fd4fa7

Unfortunately this did not revert the repo to that node.

Can someone help to clean up the "next" branch, please?


Thanks and apologies,
-- 
Marco

Re: Branch "next" garbled

[Nicolas Goaziou]

Hello,

Marco Wahl <marcowahlsoft@gmail.com> writes:

> Hello fellow Orgers,
>
> This is more an internal issue about the repo and in particular the
> "next" branch.
>
> My git fu was not strong enough and so the "next" branch is a bit messy
> right now.  (I tried to activate a local clean version of the "next"
> branch.)
>
> I thought I could easily rollback the mess I created by going back to
> the git node 3c8fd4fa7 which is the last git node before my activities.
>
> The command I used is
>
>     git revert 3c8fd4fa7
>
> Unfortunately this did not revert the repo to that node.
>
> Can someone help to clean up the "next" branch, please?

I think I cleaned it.

To prevent further complications with this branch, I suggest to treat is
like master and master like maint. I.e., every commit done in master is
duplicated into next so that final merge is easier.

WDYT?

Regards,

-- 
Nicolas Goaziou

Re: Branch "next" garbled

[Marco Wahl]

>> My git fu was not strong enough and so the "next" branch is a bit messy
>> right now.  (I tried to activate a local clean version of the "next"
>> branch.)

>> [...]

>> Can someone help to clean up the "next" branch, please?
>
> I think I cleaned it.

Thank you so much!

> To prevent further complications with this branch, I suggest to treat is
> like master and master like maint. I.e., every commit done in master is
> duplicated into next so that final merge is easier.

> WDYT?

This is a clear rule, which is easy to follow and easy to remember (at
least for me).  I love this!


Thanks and best regards,
                        Marco

Re: Branch "next" garbled

[Adrian Bradd]

Hi all,

> To prevent further complications with this branch, I suggest to 
> treat is
> like master and master like maint. I.e., every commit done in 
> master is
> duplicated into next so that final merge is easier.

Sorry if this is obvious, but what is the next branch?

This is the first I have heard of it (not that my org-fu is all 
that comprehensive). I took a look around but I couldn't find any 
details about it in the mail archives. Granted I wasn't expecting 
much from a search that included the phrase "next branch". It 
isn't mentioned on worg in the developers section either 
(https://orgmode.org/worg/dev/index.html).

Cheers,

-- 
Adrian Bradd

Re: Branch "next" garbled

[Kaushal Modi]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

On Thu, Oct 11, 2018, 9:46 PM Adrian Bradd <adrian.bradd@gmail.com> wrote:

>
> Sorry if this is obvious, but what is the next branch
>

Simply put, the next branch is even more bleeding edge than the master.

Bleeding-edgeness: next > master > maint

- maint :: gets published to Org Elpa, etc. Right now the version there is
9.1.x. This branch only takes bug and doc fixes right now
- master :: this is the soon(TM)-to-be released Org 9.2 version. This has
quite a many features (including few breaking) on top of Org 9.1.x. As this
version is planned to be released soon, the plan is to not touch this
branch for the time being as it gets tested out more. Touch this only for
doc and bug fixes for Org 9.2.
- next :: This branch is open to all sorts of commits. Changes here won't
be visible until the next to next major Org release (probably 9.3?).

In general, you would always commit to the most stable branch first and
then merge that to the next less stable branch in succession.

The less stable branch always contains all commits (as-is or merged) from
the more stable branch.

It isn't mentioned on worg in the developers section either
> (https://orgmode.org/worg/dev/index.html).
>

My understanding is that the next branch is not a long term thing.

>

[-- Attachment #2: Type: text/html, Size: 2393 bytes --]

Re: Branch "next" garbled

[Uwe Koloska]

Am 03.10.18 um 13:45 schrieb Marco Wahl:
> My git fu was not strong enough and so the "next" branch is a bit messy
> right now.  (I tried to activate a local clean version of the "next"
> branch.)
> 
> I thought I could easily rollback the mess I created by going back to
> the git node 3c8fd4fa7 which is the last git node before my activities.
> 
> The command I used is
> 
>     git revert 3c8fd4fa7
> 
> Unfortunately this did not revert the repo to that node.

To make your git fu a bit stronger, let me explain this:

'git revert' creates a new commit, that reverses the changes from the
given commit, so it's not, what you have had in mind (and what is common
for SCMs like SVN where you cannot rewrite the history). You are looking
for 'git reset':
  https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified


There are other ways, to achieve the same result:

Just rename the branch and checkout a new one with the old name at the
given commit. That gives you a nice backup for free.

Or utilize the 'reflog':
  http://gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html

Hope this helps
Uwe