Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-18 Thread Phillip Wood
On 15/04/18 18:17, Philip Oakley wrote: > From: "Phillip Wood" > : Friday, April 13, 2018 11:03 AM >> If a label or reset command fails it is likely to be due to a >> typo. Rescheduling the command would make it easier for the user to fix >> the problem as they can just run 'git rebase --edit-todo

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-15 Thread Philip Oakley
From: "Phillip Wood" : Friday, April 13, 2018 11:03 AM If a label or reset command fails it is likely to be due to a typo. Rescheduling the command would make it easier for the user to fix the problem as they can just run 'git rebase --edit-todo'. Is this worth noting in the command documenta

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-13 Thread Phillip Wood
On 10/04/18 13:29, Johannes Schindelin wrote: > In the upcoming commits, we will teach the sequencer to rebase merges. > This will be done in a very different way from the unfortunate design of > `git rebase --preserve-merges` (which does not allow for reordering > commits, or changing the branch t

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-11 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Wed, 11 Apr 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> [...] >> >> > We disallow '#' as label because that character will be used as >> > separator in the upcoming `merge` command. >> >> Please consider to u

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-11 Thread Johannes Schindelin
Hi Sergey, On Wed, 11 Apr 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > > We disallow '#' as label because that character will be used as > > separator in the upcoming `merge` command. > > Please consider to use # not only in `merge` and `reset`, but in the > rest of

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-10 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: [...] > We disallow '#' as label because that character will be used as separator > in the upcoming `merge` command. Please consider to use # not only in `merge` and `reset`, but in the rest of the commands as well, to unify this new syntax. I.e., right

[PATCH v6 04/15] sequencer: introduce new commands to reset the revision

2018-04-10 Thread Johannes Schindelin
In the upcoming commits, we will teach the sequencer to rebase merges. This will be done in a very different way from the unfortunate design of `git rebase --preserve-merges` (which does not allow for reordering commits, or changing the branch topology). The main idea is to introduce new todo list