Re: [Plplot-devel] PLplot 6 and git

2015-05-23 Thread Phil Rosenberg
Hi Alan My initial thought was as yours. To have a separate plplot6 branch. I have a feeling that with so many of us it might be difficult to keep track of sending patches round. Do you know how that would work with clashes? I.e if two people send patches round that clash do we have the potentia

[Plplot-devel] Improved fix for plInBuildTree on Windows

2015-05-23 Thread Alan W. Irwin
To Arjen and Phil: I have just now (commit id 3644bc3) reverted Phil's recent C-level fix for plInBuildTree on Windows and replaced it with a more general CMake-level fix that makes sure IGNORECASE is always #defined on all varieties of Windows. Since all sorts of tests are sensitive to plInBuild

Re: [Plplot-devel] PLplot 6 and git

2015-05-23 Thread David MacMahon
Hi, Phil et al., On May 23, 2015, at 1:23 AM, Phil Rosenberg wrote: > I could make one last alternative suggestion. We could have a private git > site. This could have separate 5.8 and 6 branches. Then when we are ready to > merge we can rebase the branch, push it to our sf repo and close the s

Re: [Plplot-devel] PLplot 6 and git

2015-05-23 Thread Alan W. Irwin
On 2015-05-23 09:23+0100 Phil Rosenberg wrote: > Hi Alan > My initial thought was as yours. To have a separate plplot6 branch. I have a feeling that with so many of us it might be difficult to keep track of sending patches round. Do you know how that would work with clashes? I.e if two people sen

Re: [Plplot-devel] PLplot 6 and git

2015-05-23 Thread Alan W. Irwin
Hi Dave: I already made my points about continuing with the present workflow for quite a while longer if not indefinitely in my original post starting this topic so I think we just have to agree to disagree on this issue. Fundamentally, the git world is split on the rebase-only versus merge-only