-------- Weitergeleitete Nachricht -------- Betreff: Re: Github loses comments Datum: Tue, 07 Jul 2015 00:29:38 -0700 Von: Ivan Žužak support@github.com An: Thomas Martitz kugel@rockbox.org
Hi Thomas,
Thanks for sharing those details about your workflow.
If you create a comment on a commit which is a part of a pull request, and later on blow away that commit from the pull request with a rebase + force-push combo -- then that commit is no longer a part of the pull request so the comments are no longer shown inline on the pull request page.
However, if you create comments on the pull request's diff itself -- then those comments are tied to the pull request. After you update a pull request (even with a rebase), those comments will still be around on the pull request page, but will be shown as "user commented on an outdated diff a day ago".
So, my suggestion would be to comment on the pull request's diff if you're using a rebase-based workflow. We understand that commenting on specific commits is helpful in some situations, and we're looking into ways to keep comments around on pull request pages even after you rebase away the commits they were created on. I can't make any promises about this, but it is on our radar.
Let me know if I misunderstood anything, if you have any questions or if you want to share more details so that I can pass the feedback to the team.
Cheers, Ivan
Hello,
when a pull request is updated though a history rewrite (e.g. rebase, amend, commits reodered) to make the history accepatable for the main repository, then github sometimes loses comments associated with the pull request. This is annoying as it really makes reviewing *more* difficult. But only ever adding fixup commits is not acceptable either as it would add unwanted commits in the main repository (for example, if they break the build of a project it makes bisecting harder than necessary, therefore some commits are not acceptable for merging into the master branch).
Can this be fixed? I do notice that github some other times shows comments through "X commented on an outdated diff". This seems a lot better than deleting valuable comments altogether.
Best regards
On 2015-07-07 01:44 AM, Thomas Martitz wrote:
-------- Weitergeleitete Nachricht -------- Betreff: Re: Github loses comments Datum: Tue, 07 Jul 2015 00:29:38 -0700 Von: Ivan Žužak support@github.com An: Thomas Martitz kugel@rockbox.org
Hi Thomas,
Thanks for sharing those details about your workflow.
If you create a comment on a commit which is a part of a pull request, and later on blow away that commit from the pull request with a rebase + force-push combo -- then that commit is no longer a part of the pull request so the comments are no longer shown inline on the pull request page.
Sadly, makes sense.
However, if you create comments on the pull request's diff itself -- then those comments are tied to the pull request. After you update a pull request (even with a rebase), those comments will still be around on the pull request page, but will be shown as "user commented on an outdated diff a day ago".
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
Cheers, Matthew Brush
On 8 July 2015 at 13:19, Matthew Brush mbrush@codebrainz.ca wrote:
On 2015-07-07 01:44 AM, Thomas Martitz wrote:
-------- Weitergeleitete Nachricht -------- Betreff: Re: Github loses comments Datum: Tue, 07 Jul 2015 00:29:38 -0700 Von: Ivan Žužak support@github.com An: Thomas Martitz kugel@rockbox.org
Hi Thomas,
Thanks for sharing those details about your workflow.
If you create a comment on a commit which is a part of a pull request, and later on blow away that commit from the pull request with a rebase + force-push combo -- then that commit is no longer a part of the pull request so the comments are no longer shown inline on the pull request page.
Sadly, makes sense.
However, if you create comments on the pull request's diff itself -- then those comments are tied to the pull request. After you update a pull request (even with a rebase), those comments will still be around on the pull request page, but will be shown as "user commented on an outdated diff a day ago".
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
That makes sense, yeah.
Cheers, Matthew Brush
Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Le 08/07/2015 05:19, Matthew Brush a écrit :
[…]
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
Depends what you mean "ok", but yeah they shouldn't get lost.
The problem is that sometimes it's a lot handier to comment on a specific commit's diff rather than the whole thing.
Cheers, Colomban
On 8 July 2015 at 22:07, Colomban Wendling lists.ban@herbesfolles.org wrote:
Le 08/07/2015 05:19, Matthew Brush a écrit :
[…]
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
Depends what you mean "ok", but yeah they shouldn't get lost.
The problem is that sometimes it's a lot handier to comment on a specific commit's diff rather than the whole thing.
Well I'm sure github would accept patches/pull requests :)
But in the meantime at least there is a workaround.
Cheers Lex
Cheers, Colomban _______________________________________________ Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel
Am 09.07.2015 um 11:54 schrieb Lex Trotman:
On 8 July 2015 at 22:07, Colomban Wendling lists.ban@herbesfolles.org wrote:
Le 08/07/2015 05:19, Matthew Brush a écrit :
[…]
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
Depends what you mean "ok", but yeah they shouldn't get lost.
The problem is that sometimes it's a lot handier to comment on a specific commit's diff rather than the whole thing.
Well I'm sure github would accept patches/pull requests :)
Github is closed source...
Best regards
On 9 July 2015 at 20:10, Thomas Martitz kugel@rockbox.org wrote:
Am 09.07.2015 um 11:54 schrieb Lex Trotman:
On 8 July 2015 at 22:07, Colomban Wendling lists.ban@herbesfolles.org wrote:
Le 08/07/2015 05:19, Matthew Brush a écrit :
[…]
So does that mean it's ok to make comments either on the main page of the pull request or the "files changed" view which shows the combined changes?
Depends what you mean "ok", but yeah they shouldn't get lost.
The problem is that sometimes it's a lot handier to comment on a specific commit's diff rather than the whole thing.
Well I'm sure github would accept patches/pull requests :)
Github is closed source...
Which is why the :)
Best regards
Devel mailing list Devel@lists.geany.org https://lists.geany.org/cgi-bin/mailman/listinfo/devel