Re: [osg-users] Submission/Pull Request problems on github

[John Hughes]

Hi Robert,


robertosfield wrote:
> 
> I'm struggling to find a way to get git to allow me to
> merge one file at a time and presented with a graphics diff that
> allows me to individually accept/discard changes.
> 


There are great tools that do exactly this. I use kdiff3.

http://www.gitguys.com/topics/merging-with-a-gui/

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67189#67189





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Pjotr Svetachov]

According to these post you can let the git tools automatically make a branch 
for every pull request on github:
http://blog.scottlowe.org/2015/09/04/checking-out-github-pull-requests-locally/
https://coderwall.com/p/3dgwcg/github-add-remote-for-pulls-and-merges

Cheers,
Pjotr

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67178#67178





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Björn Blissing]

robertosfield wrote:
> Hi Björn,
> 
> I just checked, github still isn't giving my an option to reopen the
> pull request. Could you try another push of the request?
> 


I have submitted my pull request again (it was the gitignore patterns for 
Visual Studio). 


robertosfield wrote:
> 
> I'm struggling to get git to work in a way that allows me to do a
> proper review with the ability to graphically comparing sets of
> changes, for instance I have a set one pull request that has 88 files
> modified, alot of files but a small number of relatively minor changes
> such a variable renames.  I've done a quick review online and spotted
> that one instance so far where this renaming actually introduces a
> bug.
> 
> I've experimented with pull in the 3rd party clone of the
> openscenegraph that contains these modfications and successfully
> created a patch and applying this to a local branch on my
> openscenegraph, it applies fine but contains the known error, perhaps
> others that I'll spot once I go through another full review.  This is
> where graphically diff is crucial.  git makes it dead easy to merge
> many file changes with a couple of lines of git on the command line,
> but as yet I'm struggling to find a way to get git to allow me to
> merge one file at a time and presented with a graphics diff that
> allows me to individually accept/discard changes.
> 
> Will I need to write my own script to do this?   To do this I'd need
> to get to spit out a list of all the modified files in a form that I
> can pass into a script.
> 
> As things stand I am not prepared to merge a big patch with an unknown
> number of bugs introduced simply because git makes it convenient to
> merge as is and makes it hard to spot errors and intervene.
> 
> Thoughts, advice how to workaround these problems using git?
> 


I agree that doing merges online using the GitHub platform is a very bad idea, 
except for trivial changes (for example changing a spelling error inside a 
readme file).

For all cases with source code I will fetch the pull request to my local 
machine and do the merge to my workspace. Then I can use my favorite diff tool 
as well as compile and test. If all my tests pass then I commit the merge to 
the master branch and push the changes to the online repo.

(The above workflow is pretty much identical to: applying a patch file -> 
test -> commit to SVN.)

Regards
Björn

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67177#67177





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Robert Osfield]

Hi Björn,

I just checked, github still isn't giving my an option to reopen the
pull request. Could you try another push of the request?

Robert.

On 20 May 2016 at 13:34, Björn Blissing  wrote:
>
> robertosfield wrote:
>>
>> Do you know what steps do members of the community need to do to fix
>> things?  Perhaps we can pass instructions on via comments of each pull
>> request.
>
>
> Hi Robert,
>
> Since you rewrote the entire history I had to hard reset all my branches in 
> my forked repo. So for each branch I was had do:
>
>
> Code:
> git checkout master
> git reset --hard upstream/master
> git push origin master -f
>
>
>
> I also tried to rebase my old pull request to the new master. But that took 
> forever. So I resetted that branch as well and recommitted my change. But 
> even when I force pushed this branch to my repo, the corresponding pull 
> request did not update and is still closed.
>
> Regards
> Björn
>
> --
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=67175#67175
>
>
>
>
>
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Björn Blissing]

robertosfield wrote:
> 
> Do you know what steps do members of the community need to do to fix
> things?  Perhaps we can pass instructions on via comments of each pull
> request.


Hi Robert,

Since you rewrote the entire history I had to hard reset all my branches in my 
forked repo. So for each branch I was had do:


Code:
git checkout master
git reset --hard upstream/master
git push origin master -f



I also tried to rebase my old pull request to the new master. But that took 
forever. So I resetted that branch as well and recommitted my change. But even 
when I force pushed this branch to my repo, the corresponding pull request did 
not update and is still closed.

Regards
Björn

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67175#67175





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Robert Osfield]

Hi All,

I'm struggling to get git to work in a way that allows me to do a
proper review with the ability to graphically comparing sets of
changes, for instance I have a set one pull request that has 88 files
modified, alot of files but a small number of relatively minor changes
such a variable renames.  I've done a quick review online and spotted
that one instance so far where this renaming actually introduces a
bug.

I've experimented with pull in the 3rd party clone of the
openscenegraph that contains these modfications and successfully
created a patch and applying this to a local branch on my
openscenegraph, it applies fine but contains the known error, perhaps
others that I'll spot once I go through another full review.  This is
where graphically diff is crucial.  git makes it dead easy to merge
many file changes with a couple of lines of git on the command line,
but as yet I'm struggling to find a way to get git to allow me to
merge one file at a time and presented with a graphics diff that
allows me to individually accept/discard changes.

Will I need to write my own script to do this?   To do this I'd need
to get to spit out a list of all the modified files in a form that I
can pass into a script.

As things stand I am not prepared to merge a big patch with an unknown
number of bugs introduced simply because git makes it convenient to
merge as is and makes it hard to spot errors and intervene.

Thoughts, advice how to workaround these problems using git?

Robert.


On 20 May 2016 at 09:43, Robert Osfield  wrote:
> Hi Jannik,
>
> Thanks for the info.  Looks like my fix of the author name/email
> address yesterday created all these problems with pull requests.
>
> I've developed rather a love/hate relationship with git and github.
> Some things going really smoothly but then can turn around and bite
> you and just throw lots of road blocks in you way, constraining you to
> work with certain path or break things.  So far git has created far
> more work for me than it's saved.
>
> I find it a bit depressing that there is still so much more to learn
> about git and github before I can safely master it.  Personally I'd
> rather just get on code, fix problems with the OSG itself rather
> jumping through hoops to use tools that are "supposed" to help your
> work.
>
> For now I have 30 pull requests to fix in some fashion as they aren't
> in anyway useful as things stand.  First step will be to get all those
> who've made a pull request to fetch the new history then see what
> happens on github.  Perhaps it'll automatically fix things, perhaps
> the author will have to resubmit.
>
> Do you know what steps do members of the community need to do to fix
> things?  Perhaps we can pass instructions on via comments of each pull
> request.
>
> Submitted code to osg-submissions might not be perfect but it's been a
> hell of lot more reliable and robust than github.
>
> Robert.
>
> On 19 May 2016 at 20:05, Jannik Heller  wrote:
>> Hi Robert,
>>
>> by fixing the author names you have essentially re-written the repository 
>> history. This means that everyone who submitted pull-requests in the past 
>> will have to manually rebase their changes on top of the new history. But 
>> it's not so difficult to do that if you know how to use the git rebase tool.
>>
>> The github document "Changing author info" (which I assume you were looking 
>> at?) does state this caveat:
>>
>> "Note: Running this script rewrites history for all repository 
>> collaborators. After completing these steps, any person with forks or clones 
>> must fetch the rewritten history and rebase any local changes into the 
>> rewritten history."
>>
>> In the future you may want to avoid rewriting history (i.e. anything that 
>> requires a force-push) since it does cause disruption for people that have 
>> already sent in changes. But it's not a big deal now since github is not 
>> even the official submission route yet.
>>
>> As for checking out the changes in pull requests that were not adapted, you 
>> can look at the author's repository (e.g. 
>> https://github.com/vivijind/OpenSceneGraph/commits/master shows the commits 
>> for PR https://github.com/openscenegraph/OpenSceneGraph/pull/68). In some 
>> cases it looks like the authors have deleted their repository, but you can 
>> still check out the pull request locally ( 
>> https://help.github.com/articles/checking-out-pull-requests-locally/ ) and 
>> from there look at the included commits.
>>
>> Cheers,
>> Jannik
>>
>> --
>> Read this topic online here:
>> http://forum.openscenegraph.org/viewtopic.php?p=67161#67161
>>
>>
>>
>>
>>
>> ___
>> osg-users mailing list
>> osg-users@lists.openscenegraph.org
>> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
___
osg-users mailing list
osg-users@lists.openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Robert Osfield]

Hi Jannik,

Thanks for the info.  Looks like my fix of the author name/email
address yesterday created all these problems with pull requests.

I've developed rather a love/hate relationship with git and github.
Some things going really smoothly but then can turn around and bite
you and just throw lots of road blocks in you way, constraining you to
work with certain path or break things.  So far git has created far
more work for me than it's saved.

I find it a bit depressing that there is still so much more to learn
about git and github before I can safely master it.  Personally I'd
rather just get on code, fix problems with the OSG itself rather
jumping through hoops to use tools that are "supposed" to help your
work.

For now I have 30 pull requests to fix in some fashion as they aren't
in anyway useful as things stand.  First step will be to get all those
who've made a pull request to fetch the new history then see what
happens on github.  Perhaps it'll automatically fix things, perhaps
the author will have to resubmit.

Do you know what steps do members of the community need to do to fix
things?  Perhaps we can pass instructions on via comments of each pull
request.

Submitted code to osg-submissions might not be perfect but it's been a
hell of lot more reliable and robust than github.

Robert.

On 19 May 2016 at 20:05, Jannik Heller  wrote:
> Hi Robert,
>
> by fixing the author names you have essentially re-written the repository 
> history. This means that everyone who submitted pull-requests in the past 
> will have to manually rebase their changes on top of the new history. But 
> it's not so difficult to do that if you know how to use the git rebase tool.
>
> The github document "Changing author info" (which I assume you were looking 
> at?) does state this caveat:
>
> "Note: Running this script rewrites history for all repository collaborators. 
> After completing these steps, any person with forks or clones must fetch the 
> rewritten history and rebase any local changes into the rewritten history."
>
> In the future you may want to avoid rewriting history (i.e. anything that 
> requires a force-push) since it does cause disruption for people that have 
> already sent in changes. But it's not a big deal now since github is not even 
> the official submission route yet.
>
> As for checking out the changes in pull requests that were not adapted, you 
> can look at the author's repository (e.g. 
> https://github.com/vivijind/OpenSceneGraph/commits/master shows the commits 
> for PR https://github.com/openscenegraph/OpenSceneGraph/pull/68). In some 
> cases it looks like the authors have deleted their repository, but you can 
> still check out the pull request locally ( 
> https://help.github.com/articles/checking-out-pull-requests-locally/ ) and 
> from there look at the included commits.
>
> Cheers,
> Jannik
>
> --
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=67161#67161
>
>
>
>
>
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Alberto Luaces]

"Jannik Heller" writes:

> Hi Robert,
>
> by fixing the author names you have essentially re-written the
> repository history. This means that everyone who submitted
> pull-requests in the past will have to manually rebase their changes
> on top of the new history. But it's not so difficult to do that if you
> know how to use the git rebase tool.
>
> The github document "Changing author info" (which I assume you were looking 
> at?) does state this caveat:
>
> "Note: Running this script rewrites history for all repository
> collaborators. After completing these steps, any person with forks or
> clones must fetch the rewritten history and rebase any local changes
> into the rewritten history."
>
> In the future you may want to avoid rewriting history (i.e. anything
> that requires a force-push) since it does cause disruption for people
> that have already sent in changes. But it's not a big deal now since
> github is not even the official submission route yet.

In addition to that, one may still recover the past state through the
reflog, and apply the recent changes on top of it.

Whether you stay with the old history or the new one is a matter of
taste, since as Jannik says, in the latter case, others can
exceptionally rebase their repositories to be synchronized again with
the official repository.

-- 
Alberto

___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Submission/Pull Request problems on github

[Jannik Heller]

Hi Robert,

by fixing the author names you have essentially re-written the repository 
history. This means that everyone who submitted pull-requests in the past will 
have to manually rebase their changes on top of the new history. But it's not 
so difficult to do that if you know how to use the git rebase tool.

The github document "Changing author info" (which I assume you were looking 
at?) does state this caveat:

"Note: Running this script rewrites history for all repository collaborators. 
After completing these steps, any person with forks or clones must fetch the 
rewritten history and rebase any local changes into the rewritten history."

In the future you may want to avoid rewriting history (i.e. anything that 
requires a force-push) since it does cause disruption for people that have 
already sent in changes. But it's not a big deal now since github is not even 
the official submission route yet.

As for checking out the changes in pull requests that were not adapted, you can 
look at the author's repository (e.g. 
https://github.com/vivijind/OpenSceneGraph/commits/master shows the commits for 
PR https://github.com/openscenegraph/OpenSceneGraph/pull/68). In some cases it 
looks like the authors have deleted their repository, but you can still check 
out the pull request locally ( 
https://help.github.com/articles/checking-out-pull-requests-locally/ ) and from 
there look at the included commits.

Cheers,
Jannik

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67161#67161





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

[osg-users] Submission/Pull Request problems on github

[Robert Osfield]

Hi All,

I am currently working on a submissions purge.  My first port has call
has been clearing the submissions back log submitted via the official
osg-submissions mailing list.  Still a way to go so please be patient.

There are also pull requests on github but these still aren't the
official route for providing submissions which is providing whole
modified files sent to osg-submissions, because well it's been pretty
reliable over the year.  I have tried a few pull requests but I'm
still not git guru so it can be painful trying to make sure things are
properly reviewed without mistakes creeping in.

My plan is to steadily learn more about git/github and adapting it
with scripts to better suit the workflow that ensures things are
merged and tested safely with low overhead.  This post isn't about
this, and it's certainly not a post saying I'm ready for a pull
request free for all.  The official route for submissions is post
whole modified files to osg-submissions.

In dipping my toes in the water of learning and merging submissions
that are source form Pull Requests today I looked at the Pull Request
list and for some reason github has closed the majority of the open
requests.  I didn't close them even though github suggests it was the
openscenegraph user that did it.

I have attempted to reopen requests but the github interfaces isn't
allowing me to do this.

The closed pull requests also have broken file lists and links so I'm
not able to find out what has been changed.  This leaves me with just
a title and some comments form the author of the Pull Request.  The
Pull Requests also have lots of unrelated commits mixed into the
discussion thread so something has royally confused github.

The only thing I can think of that I may have done at my end was to
fix the author names in repository.  I used scripts and instructions
that were published by github for doing this.  Outwardly these changes
looked to have worked just fine.  Perhaps there is some un-intended
consequence for githubs booking that the instructions never mentioned
about.

Or perhaps simply something has screwed up at github.

Anyway, this means for now all the in appropriately closed Pull
Requests are lost as far as my ability to follow up on them in any
way.  This means the community need to check there Pull Requests and
if they have gone astray to re-submit them.  Don't just do a Pull
Request, please send the whole modified files to osg-submissions as
this is still the official and crucially most reliable way to submit
changes.

Thanks,
Robert.
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org