[Plplot-devel] git blog

On 2019-05-07 17:51-0600 Orion Poplawski wrote: See commit plplot-5.14.0-38-g6b00b9717. Thanks. Looks like someone filed a Fedora bug with a patch as well so I'm all set now. BTW - I have no idea how to find the above commit ID. It git proper it seems to be

[Plplot-devel] git blog

On 2018-12-22 17:46- António Rodrigues Tomé wrote: Hi I must confess that I'm completely unable to work with git. As git is a widely used tool it is certainly my problem. After many hours just to be able to perform first instructions in develop file specially because I tried to read a git

[Plplot-devel] git blog

I just discovered the --word-diff option to "git diff" command. That option has proven to be essential for evaluation of my recent commits concerning markdown format files (which all have extraordinarily long lines which makes "git diff" output without the --word-diff option essentially

[Plplot-devel] git blog

Can some git guru here advise me what I need to do to publish a bug fix release (in case during this release cycle some bug fix is so urgent that we need to make a bug-fix 5.13.1 release to propagate that fix to our users)? I assume I would branch a private topic branch called "release" for this

[Plplot-devel] git blog

On 2016-12-14 21:35-0800 Alan W. Irwin wrote: > One issue you should be aware of is git blame results are obfuscated > by our code styling events (often triggered by me) which amount to > putting random blanks in the code to make it conform to our style. > > So > > software@raven> git blame

[Plplot-devel] git blog

For my (Debian Jessie) version of git, the default color for displaying the commit hash in the "git log" output is yellow. That is a bad choice on normal terminals like mine with a white background because it makes the commit hash (extremely important and useful information) virtually unreadable.

Re: [Plplot-devel] git blog

Hi Alan, > -Original Message- > From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] > Sent: Wednesday, March 16, 2016 6:28 PM > To: Arjen Markus > Cc: PLplot development list > Subject: RE: git blog > > On 2016-03-16 09:12- Arjen Markus wrote: > > > Hi Alan, > > > > > > > >>

Re: [Plplot-devel] git blog

On 2016-03-16 09:12- Arjen Markus wrote: > Hi Alan, > > > >> -Original Message- >> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] >> Sent: Wednesday, March 16, 2016 10:08 AM >> To: Arjen Markus >> Cc: PLplot development list >> Subject: git blog >> >> On 2016-03-16 08:04-

Re: [Plplot-devel] git blog

Hi Alan, > -Original Message- > From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] > Sent: Wednesday, March 16, 2016 10:08 AM > To: Arjen Markus > Cc: PLplot development list > Subject: git blog > > On 2016-03-16 08:04- Arjen Markus wrote: > > > By the way, your most recent

[Plplot-devel] git blog

On 2016-03-16 08:04- Arjen Markus wrote: > By the way, your most recent commits did not show up in the log. But when I did "git merge -ff-only origin/master" I did get the changes. Very odd. Probably not that odd. "git log" generates the log _for the current branch_. So if you had checked

Re: [Plplot-devel] git blog: git am conflict resolution

On 2015-12-29 14:16-0800 Alan W. Irwin wrote: Part II. > The above URL [] > implies you should use the --reject git am option when > -3 does not work, and I will say more about the practical details of > how you

[Plplot-devel] git blog: git am conflict resolution

Arjen and I are working together on the new Fortran binding and since we are both doing lots of editing in the same files, the probability of conflicts (where we both edit the same area of the file in our individual commits so that the patch process fails) is higher than normal. Here is the first

Re: [Plplot-devel] git blog

On 2015-12-16 08:22- Arjen Markus wrote: > Hi Alan, > > > >> -Original Message- >> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] >> Sent: Wednesday, December 16, 2015 12:59 AM >> To: PLplot development list >> Subject: [Plplot-de

Re: [Plplot-devel] git blog

By the way, if you are interested in keeping to wxWidgets to 2.8, then the wxUString is just used to convert from the utf32 format used by plplot into wxWidgets wxString format. I guess we could do that another way if we wanted? That said wxWidgets 3.0 has been around nearly two years and the

Re: [Plplot-devel] git blog

Hi, Alan, I don't know of any such option, but perhaps a newer version of git has added this feature? Another option might be to "go rogue" and use the patch utility to apply the patch in the working copy, then "git add" and "git commit" manually. Maybe patch will be able to ignore the

[Plplot-devel] git blog

I have a question for the git gurus here. I just ran into difficulty with git apply (as wrapped by git am) because the patch file was created before a styling change that changed whitespace not only for the context lines but also the single line (in this case) that was replaced by several lines.

Re: [Plplot-devel] git blog

Thanks, Arjen, I didn't know that Tortoise SVN supported that. Now I'll have to tone down my praise of git add a little! :-) Dave On Feb 3, 2015, at 2:50 AM, Arjen Markus wrote: Hi everyone, In defence of SVN – couldn’t help myself – the tool (Tortoise SVN) I have been using for years

Re: [Plplot-devel] git blog

Hi everyone, In defence of SVN - couldn't help myself - the tool (Tortoise SVN) I have been using for years now to deal with SVN has given me much the same degree of freedom, as it presents a nice dialogue to select the files and edit the commit message etc. As my first experiences with git

[Plplot-devel] git blog

On 2015-01-30 10:22-0800 David MacMahon wrote: I first thought that [git add] was a weird and annoying extra step, but I have grown fond of this capability as well. I often find myself with several files to commit, yet the changes are not all related. Git makes it easy to commit only some of

Re: [Plplot-devel] git blog

Hi, Alan, On Jan 30, 2015, at 2:43 AM, Alan W. Irwin wrote: So instead of either set of commands above you should be following the detailed recipe which is git checkout master git fetch git merge --ff-only origin/master FWIW, the pull command also accepts --ff-only. I have setup a puff

Re: [Plplot-devel] git blog

On Jan 30, 2015, at 3:56 AM, Alan W. Irwin wrote: git log --name-status Nice! I didn't know about --name-status. I've always used --stat. Same idea, slightly different output. Dave -- Dive into the World of

[Plplot-devel] git blog

Hi Arjen: I am changing the subject line for obvious reasons On 2015-01-30 09:40- Arjen Markus wrote: [ A]t this stage I want to stick to the receipe :) Exactly. And this is a perfect example why the detailed recipe is the thing to follow. If you decided to use git checkout

Re: [Plplot-devel] git blog

Hi Alan, There is one thing that I am wondering about: -Original Message- From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] But that last command is potentially dangerous and could lead to a merge commit (if the local master has been updated in any way since the last time

Re: [Plplot-devel] git blog

On 2015-01-30 10:51- Arjen Markus wrote: The receipe also says that you can use the log subcommand to inspect the changes. But when I do that, I get to see the log messages for the various commits, but not the files that were changed. How do I do that? git log --name-status Alan

Re: [Plplot-devel] git blog

Hi Alan, Another one for the receipe :). Thanks, Arjen -Original Message- From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca] Sent: Friday, January 30, 2015 12:56 PM To: Arjen Markus Cc: Phil Rosenberg; PLplot development list Subject: RE: git blog On 2015-01-30

[Plplot-devel] git blog

Some of the PLplot developers (including me) are relatively inexperienced with git so the purpose of this git blog is to discuss new issues or new killer features we have discovered with git, and I hope others here participate in this series of posts as well as a pretty good method of jointly

Re: [Plplot-devel] git blog

Hi, Alan, On Oct 22, 2014, at 6:17 PM, Alan W. Irwin wrote: Today I wanted to discover the author, commit id, and the date for a commit that created a particular line in a file (the restore_cmap1() line in examples/python/xw08.py which has no C counterpart). After a bit of searching I

Re: [Plplot-devel] git blog

Remember the three file status's (unstaged, staged, and committed) that are emphasized so much by the Pro Git book? Intellectually I know these distinctions are important, but they still caught me by suprise today. It turns out that both unstaged and staged git changes persist between

[Plplot-devel] git blog

From time to time I will make some blog-like comments here about my (new) experiences with git from the point of view of a long-time subversion user. I encourage and welcome further discussion of these topics as we all learn to work together on PLplot development with git. Remember the three