Hi Bjorn, Thanks for the suggestions, unfortunately they didn't work for me under Linux, Sergey's link to using a script wrapper and diff.external did work though so I now have the ability to do graphical diff which is a big step forward.
However, there are still things I'm not happy about the proposed workflow, it's not as straight forward or as flexible as my the workflow that I've honed over the years. I may eventually have git more directly integrated with workflow as it evolves but right now that "git way" still grates against how I naturally won't to work. Robert. On 22 February 2016 at 12:49, Björn Blissing <[email protected]> wrote: > Well, > > > > Git supports kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, > gvimdiff, ecmerge, diffuse, opendiff, p4merge and araxis. So if you are > using any of those you are pretty much set. > > > > Just change the default diff tool with (replace tkdiff with whatever diff > tool you are using): > > git config --global diff.tool tkdiff > > git config --global merge.tool tkdiff > > git config --global --add difftool.prompt false > > > > If you are not using any of the above then I guess I am out of suggestions. > > > > I use Windows and prefer SmartGit which helps me do all the things I > mentioned in my previous emails within a GUI, including diffing between > branches. It is available free for OpenSource projects and are available > for Windows, Mac and Linux. > > > > Best regards > > Björn > > > > *From:* osg-submissions [mailto: > [email protected]] *On Behalf Of *Robert > Osfield > *Sent:* Monday, February 22, 2016 1:42 PM > > *To:* OpenSceneGraph Submissions <[email protected] > > > *Subject:* Re: [osg-submissions] osgParticle freeze on cull fix > > > > Hi Bjorn, > > You seem to be ignoring my objection - graphical differ ****IS > ESSENTIAL**** for reliable code reviews. > > > > git diff isn't good enough, not by a close margin. > > Robert. > > > > > > On 22 February 2016 at 12:35, Björn Blissing <[email protected]> > wrote: > > You don’t need to jump between branches. You can diff between branches > directly : > > > > Show the changed files (the three dots indicate changes since common > ancestor, two dots would be diff between present state): > > git diff --name-status master...tempbranch > > > > You can diff single files by using their filename (with tempbranch using > one of the files in the present pull request): > > git diff tempbranch master -- src/osgParticle/ParticleProcessor.cpp > > > > You could even do a complete diff of all files changed between the > different branches: > > git diff master...tempbranch > > > > > > I respect that you do things your way. But this would be the process that > I would use: > > > > Stash my local changes (if any): > > git stash save "My latest stash" > > > > Create a temp branch from pull request: > > git fetch origin pull/50/head:tempbranch > > > > Switch to temporary branch: > > git checkout tempbranch > > > > Now I can diff files, run tests, compile code etc... Even change code and > make my own commits. > > > > If happy, I merge the pull reguest to master (I can even close the pull > request by adding either close, closes, closed, fix, fixes, fixed, resolve, > resolves or resolved and the pull request id to the commit message): > > git checkout master > > git merge tempbranch -m "My merge message, closes #50" > > > > Delete the temp branch: > > git branch -d tempbranch > > > > Finally I reapply stash with local uncommitted changes: > > git stash pop > > > > > > Regards > > Björn > > > > > > *From:* osg-submissions [mailto: > [email protected]] *On Behalf Of *Robert > Osfield > *Sent:* Monday, February 22, 2016 12:59 PM > *To:* OpenSceneGraph Submissions <[email protected] > > > *Subject:* Re: [osg-submissions] osgParticle freeze on cull fix > > > > Hi Bjorn, > > > > On 22 February 2016 at 11:49, Björn Blissing <[email protected]> > wrote: > > I respectfully disagree. > > > > If you follow the procedure in the link in my previous message, you will > have a really quick and simple workflow. > > > > Just checkout the pull request to a separate branch, (no need for a > separate repo, just stash any uncommitted changes to whatever branch you > were working with). > > > > If the pull request looks good, just merge the changes to master (and/or > any other branch). Then just switch back to master and delete the > previously created branch. > > > > You need to versions of the files to graphically diff between to do a > proper code review, so having one repository with separate branches to jump > between won't cut it. > > Jumping between different branches is not simple compared than my current > approach where I have users send their files and I just run a script to > compare them. In most cases any merging is done explicitly by me, one line > at a time. Often I won't do a full merge, cherry picking individual lines > or re-writing them as I go through the code to get the final version. > > > > Robert. > > > _______________________________________________ > osg-submissions mailing list > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > >
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
