| Message ID | 20190819214110.26461-1-me@yadavpratyush.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | git-gui: Add ability to revert selected hunks and lines | expand |
Pratyush Yadav <me@yadavpratyush.com> writes: > This series adds the ability to revert selected lines and hunks in > git-gui. Partially based on the patch by Bert Wesarg [0]. > > The commits can be found in the topic branch 'py/git-gui-revert-lines' > at https://github.com/prati0100/git/tree/py/git-gui-revert-lines Please don't do this. I would strongly prefer keeping the contination of history from the history in Pat's git-gui repository. If you clone from git://repo.or.cz/git-gui.git/ you'll notice everything for git-gui is one level up, and nothing for git-core is duplicated in there. You'll work on top of that, so the patches to the git-gui project should not say things like --- git-gui/lib/index.tcl | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index b588db11d9..cb7f74af45 100644 ... The leading "git-gui/" should not appear. I have a fork of Pat's history with a single topic on top at https://github.com/gitster/git-gui/ so building on top would maintain the continuity of the history as well. Once you prepared your changes in such a clone of the git-gui project, in order to test them with the rest of Git, you'd make a trial merge with the -Xsubtree=git-gui option. Perhaps you have git-gui's clone in $HOME/git-gui and git's clone in $HOME/git, like so $ cd $HOME $ git clone https://github.com/gitster/git-gui git-gui $ cd git-gui ... from now on, you'd work on git-gui in this directory ... ... do the work of this topic perhaps on 'revert-hunks' branch ... $ git clone https://github.com/gitster/git git $ cd ../git ... trial integration ... $ git pull -Xsubtree=git-gui ../git-gui/ revert-hunks ... do whatever testing necessary ... As an interim (and hopefully evantual) maintainer of the git-gui project, you'd publish from your local git-gui directory to a fork of git-gui project you host somewhere. Your patches for review would also be taken from your local git-gui directory. Thanks.
On 20/08/19 11:47AM, Junio C Hamano wrote: > Pratyush Yadav <me@yadavpratyush.com> writes: > > > This series adds the ability to revert selected lines and hunks in > > git-gui. Partially based on the patch by Bert Wesarg [0]. > > > > The commits can be found in the topic branch 'py/git-gui-revert-lines' > > at https://github.com/prati0100/git/tree/py/git-gui-revert-lines > > Please don't do this. All right, I'll send a re-roll of the patches based on your fork of Pat's tree as soon as I get some time. PS: Thanks for the detailed explanation of how I should structure my workflow :) > I would strongly prefer keeping the contination of history from the > history in Pat's git-gui repository. If you clone from > > git://repo.or.cz/git-gui.git/ > > you'll notice everything for git-gui is one level up, and nothing > for git-core is duplicated in there. You'll work on top of that, so > the patches to the git-gui project should not say things like > > --- > git-gui/lib/index.tcl | 27 +++++++++++++++++---------- > 1 file changed, 17 insertions(+), 10 deletions(-) > > diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl > index b588db11d9..cb7f74af45 100644 > ... > > The leading "git-gui/" should not appear. > > I have a fork of Pat's history with a single topic on top at > https://github.com/gitster/git-gui/ so building on top would > maintain the continuity of the history as well. > > Once you prepared your changes in such a clone of the git-gui > project, in order to test them with the rest of Git, you'd make a > trial merge with the -Xsubtree=git-gui option. Perhaps you have > git-gui's clone in $HOME/git-gui and git's clone in $HOME/git, like > so > > $ cd $HOME > $ git clone https://github.com/gitster/git-gui git-gui > $ cd git-gui > ... from now on, you'd work on git-gui in this directory ... > ... do the work of this topic perhaps on 'revert-hunks' branch ... > > $ git clone https://github.com/gitster/git git > $ cd ../git > ... trial integration ... > $ git pull -Xsubtree=git-gui ../git-gui/ revert-hunks > ... do whatever testing necessary ... > > As an interim (and hopefully evantual) maintainer of the git-gui > project, you'd publish from your local git-gui directory to a fork > of git-gui project you host somewhere. Your patches for review > would also be taken from your local git-gui directory. > > Thanks.
Dear Pratyush, putting me in Cc would have been nice :( I will look into your patches in the comming hours. Bert On Mon, Aug 19, 2019 at 11:41 PM Pratyush Yadav <me@yadavpratyush.com> wrote: > > Hi, > > This series adds the ability to revert selected lines and hunks in > git-gui. Partially based on the patch by Bert Wesarg [0]. > > The commits can be found in the topic branch 'py/git-gui-revert-lines' > at https://github.com/prati0100/git/tree/py/git-gui-revert-lines > > Once reviewed, pull the commits from > 832064f93d3ad432616e96ca70f682a7cfdcc3e0 till > 72eed27a29f1e71cbefefa6b19f96c89793ac74d. > > Let me know if there is some other way I'm supposed to ask for a pull. > > [0] > https://public-inbox.org/git/a9ba4550a29d7f3c653561e7029f0920bf8eb008.1326116492.git.bert.wesarg@googlemail.com/ > > Pratyush Yadav (3): > git-gui: Move revert confirmation dialog creation to separate function > git-gui: Add the ability to revert selected lines > git-gui: Add the ability to revert selected hunk > > git-gui/git-gui.sh | 39 ++++++++++++++++++++++++-- > git-gui/lib/diff.tcl | 65 ++++++++++++++++++++++++++++++++++++------- > git-gui/lib/index.tcl | 27 +++++++++++------- > 3 files changed, 109 insertions(+), 22 deletions(-) > > -- > 2.21.0 >
On 21/08/19 09:06AM, Bert Wesarg wrote: > Dear Pratyush, > > putting me in Cc would have been nice :( I wasn't sure if you were interested in git-gui any more, so I decided to not bother you. I will Cc you when I send a re-roll. > I will look into your patches in the comming hours. Thanks.