Pull request and branch in painful state

[84.le0n]

Hi all,
I've sent a pull request for PostgreSQL driver but, trying to merge with upstream/master, my branch is gone in a painful state.
Now I don't want to lose my commits and my history, if I create a new branch (after closing pull request without merging), how can I move commits from old branch to new one?

Thank you!

Eng. Gabriele Pongelli

AVVERTENZE AI SENSI DEL D.LGS. 196/2003
Le informazioni contenute in questo messaggio di posta elettronica e negli eventuali files allegati, sono da considerarsi strettamente riservati. Il loro utilizzo è consentito esclusivamente al destinatario del messaggio, per le finalità indicate nel messaggio stesso. Qualora riceveste per errore questo messaggio, Vi preghiamo cortesemente di darcene notizia all'indirizzo e-mail di cui sopra e di procedere alla distruzione del messaggio stesso, cancellandolo dal Vostro sistema; costituisce comportamento contrario ai principi dettati dal D.lgs. 196/2003 il trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalità diverse.
This electronic transmission is strictly confidential and intended solely for the addresses. It may contain information which is covered by legal, professional or other privilege. If you are not the intended addressee, you must not disclose, copy or take any action in reliance of this transmission. If you have received this transmission in error, please notify us and delete the received data as soon as possible.

[Daniel Holmes]

Try creating some git packages.



Kind Regards,

Daniel J Holmes
Director
DJCentric Network | RefreshYour.com
www.djcentric.com | www.refreshyour.com

[Daniel Holmes]

Sorry, I meant patches.

You can use the patches to merge changes from the old branch to the new branch.

Kind Regards,

Daniel J Holmes
Director
DJCentric Network | RefreshYour.com
www.djcentric.com | www.refreshyour.com

[Sam Moffatt]

You can also git cherry-pick individual commit ID's (make sure you do
them in the right order) if you want to do things that way. If you do
them one at a time any conflicts should raise themselves.

You can also do a git pull --rebase onto the Joomla! master to rebase
all of your local commits onto the master. Again, you will likely have
to deal with some merge conflicts along the way.

If you do all of this to a clean clone of your repository you can
safely play with things to see how they behave. You can also push up
the changes to a new branch (git push origin newbranchname) and see
what a pull request might look like.

Cheers,

Sam Moffatt
http://pasamio.id.au

[84.le0n]

@Daniel I've tried creating patches with eclipse and apply them, but they create a new "b" folder with my file, not adding inside libraries tree but creating a new libraries tree under "b" folder.

@Sam git pull rebase --onto seems that doesn't exists.

It's a very strange situation, my local postgresql branch hasn't code style error nor unit test error but jools tells me about two code style error and errors on unit test.
I don't know how to recover nor investigate on it.

Thank you!

Eng. Gabriele Pongelli

AVVERTENZE AI SENSI DEL D.LGS. 196/2003
Le informazioni contenute in questo messaggio di posta elettronica e negli eventuali files allegati, sono da considerarsi strettamente riservati. Il loro utilizzo è consentito esclusivamente al destinatario del messaggio, per le finalità indicate nel messaggio stesso. Qualora riceveste per errore questo messaggio, Vi preghiamo cortesemente di darcene notizia all'indirizzo e-mail di cui sopra e di procedere alla distruzione del messaggio stesso, cancellandolo dal Vostro sistema; costituisce comportamento contrario ai principi dettati dal D.lgs. 196/2003 il trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalità diverse.
This electronic transmission is strictly confidential and intended solely for the addresses. It may contain information which is covered by legal, professional or other privilege. If you are not the intended addressee, you must not disclose, copy or take any action in reliance of this transmission. If you have received this transmission in error, please notify us and delete the received data as soon as possible.

[84.le0n]

Seems that I've solved my local situation, now my postgresql branch is in synch with actual joomla-platform/master but there are many errors on unit test.

This is what jools told me:

Unit testing complete.  There were 0 failures and 51 errors from 1833 tests and 11076 assertions.
Checkstyle analysis reported 236 warnings and 2 errors.

Can anyone help me checking these platform errors and correct them ?
PostgreSQL unit test run ok, but doing all platform tests there's all these errors.

Thank you.

Eng. Gabriele Pongelli

AVVERTENZE AI SENSI DEL D.LGS. 196/2003

Le informazioni contenute in questo messaggio di posta elettronica e negli eventuali files allegati, sono da considerarsi strettamente riservati. Il loro utilizzo è consentito esclusivamente al destinatario del messaggio, per le finalità indicate nel messaggio stesso. Qualora riceveste per errore questo messaggio, Vi preghiamo cortesemente di darcene notizia all'indirizzo e-mail di cui sopra e di procedere alla distruzione del messaggio stesso, cancellandolo dal Vostro sistema; costituisce comportamento contrario ai principi dettati dal D.lgs. 196/2003 il trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalità diverse.

This electronic transmission is strictly confidential and intended solely for the addresses. It may contain information which is covered by legal, professional or other privilege. If you are not the intended addressee, you must not disclose, copy or take any action in reliance of this transmission. If you have received this transmission in error, please notify us and delete the received data as soon as possible.

Il giorno 22/nov/2011, alle ore 03:28, Sam Moffatt <pas...@gmail.com> ha scritto:

[Ian]

 <file name="/home/jools/joomla-platform/libraries/joomla/user/helper.php">

  <error line="171" column="62" severity="error" message="Concat operator must be surrounded by spaces" source="Joomla.WhiteSpace.ConcatenationSpacing.Missing"/>

  <error line="171" column="83" severity="error" message="Concat operator must be surrounded by spaces" source="Joomla.WhiteSpace.ConcatenationSpacing.Missing"/>

 </file>

Those are the two checkstyle errors.

The 51 unit test errors are because there is no PostgreSQL database setup on the build server.  If you can let me know what needs to be done to set that up I should be able to make that happen.

Regards

[84.le0n]

Check style error corrected, thank you!

I've erroneously committed some "personal" files inside "test" folder,
they are "config_mysql.php", "config_pgsql.php" and
"ddl_postgresql.sql" (I'm sorry for this); the last one is converted
version of ddl.sql and config_pgsql.php is my config file that I use
for phpunit on my local pc (dual of config_mysql.php), loaded in
JDatabasePostgreSQLTest::setUp() .
I'll remove these files from pull request after you've copied inside
build server.
That's all for Joomla PostgreSQL's configuration, do you need other
informations ?

Eng. Gabriele Pongelli.

2011/11/22 Ian <ianl...@gmail.com>:

[Rouven Weßling]

Can we set this up somehow that the Postgres test are skipped if no connection is set-up? (maybe do the same for mysql too)

I don't really wanna set up up Postgres just so I can run the unit tests.

Rouven