Re: [Plplot-devel] Rebase workflow

2015-02-22 Thread David MacMahon
Hi, Phil. On Feb 22, 2015, at 4:52 AM, Phil Rosenberg wrote: >> In addition to Alan's suggestion, another approach would be to setup a >> >local bare git repo that all your local machines could push/pull to/from. > > I tried this. As soon as I rebase a branch I am no longer able to push > it to

Re: [Plplot-devel] Rebase workflow

2015-02-22 Thread Phil Rosenberg
complex that it is easier to delete the branch from my derived repos and restart. Thanks again Phil -Original Message- From: "Alan W. Irwin" Sent: ‎22/‎02/‎2015 17:32 To: "Phil Rosenberg" Cc: "David MacMahon" ; "PLplot development list" Sub

Re: [Plplot-devel] Rebase workflow

2015-02-22 Thread Alan W. Irwin
On 2015-02-22 12:52- Phil Rosenberg wrote: >> The git format-patch and git am method has recently worked well to >> share experimental development work from one of your computers to >> mine. > This has the same downsides. As soon as I rebase a branch all patched > repos which included the reba

Re: [Plplot-devel] Rebase workflow

2015-02-22 Thread Phil Rosenberg
> In addition to Alan's suggestion, another approach would be to setup a >local > bare git repo that all your local machines could push/pull to/from. I tried this. As soon as I rebase a branch I am no longer able to push it to the local bare repo because all the changes made since the last push n

Re: [Plplot-devel] Rebase workflow

2015-02-21 Thread David MacMahon
On Feb 21, 2015, at 4:59 PM, Alan W. Irwin wrote: > On 2015-02-21 20:53- Phil Rosenberg wrote: > >> Basically the rebase workflow is causing me some real problems trying >> to use multiple machines to test my changes. I have a Windows laptop, >> which is my main machine, then I have also bee

Re: [Plplot-devel] Rebase workflow

2015-02-21 Thread Alan W. Irwin
On 2015-02-21 20:53- Phil Rosenberg wrote: > Hi all > This may not be an ideal time to bring this up, but if I don't do it > now I will probably forget. > > Basically the rebase workflow is causing me some real problems trying > to use multiple machines to test my changes. I have a Windows lap

[Plplot-devel] Rebase workflow

2015-02-21 Thread Phil Rosenberg
Hi all This may not be an ideal time to bring this up, but if I don't do it now I will probably forget. Basically the rebase workflow is causing me some real problems trying to use multiple machines to test my changes. I have a Windows laptop, which is my main machine, then I have also been tryin