I consulted with Daniel and he didn't seem to object, :),
so I went ahead and (sorry!) rewrote the latest history
for Qserv repo to undo the two messy merges that Fabrice
did. You will have to re-clone. I how I didn't cause any
troubles to anyone.


It "only" took ~40 min, and below I've dumped the list
of commands (yes, with typos and mistakes) I did to give
you a flavor of what it involves.

I am taking complaints from now until tomorrow 3pm pacific :)

   526 gitCloneQserv
   527 mv qserv qservNEW
   528 cd qservNEW
   529 git log
   530 git reset --hard 57ec5c5d
   531 gitk
   532 git checkout tickets/DM-623
   533 gitk
   534 git merge master
   535 git rebase master
   536 git status
   537 git checkout master
   538 git merge --no-ff tickets/623
   539 git merge --no-ff tickets/DM-623
   540 gitk
   541 gitk
   542 git checkout tickets/DM-510
   543 git checkout master
   544 git checkout tickets/DM-510
   545 git rebase master
   546 git status
   547 git checkout master
   548 git merge --no-ff tickets/DM-510
   549 gitk
   550 git checkout tickets/DM-365
   551 git rebase master
   552 git status
   553 emacs admin/templates/client/qserv.conf
   554 emacs admin/SConstruct
   555 meld admin/SConstruct ../qservCLEAN/admin/SConstruct
   556 git add admin/SConstruct
   557 git rebase --continue
   558 git status
   559 git branch
   560 git checkout master
   561 git merge --no-ff tickets/DM-365
   562 gitk
   563 git checkout tickets/DM-633
   564 git rebase master
   565 git status
   566 emacs admin/templates/client/qserv.conf
   567 meld admin/templates/client/qserv.conf
../qservCLEAN/admin/templates/client/qserv.conf
   568 git add admin/templates/client/qserv.conf
   569 git rebase --continue
   570 git status
   571 git branch
   572 git checkout tickets/DM-633
   573 git rebase master
   574 git rebase --abort
   575 git rebase master
   576 cp ../qservCLEAN/admin/templates/client/qserv.conf
admin/templates/client/qserv.conf
   577 git add admin/templates/client/qserv.conf
   578 git rebase --continue
   579 git rebase master
   580 git branch
   581 gitk
   582 gitk
   583 git branch
   584 git checkout tickets/DM-633
   585 git rebase --abort
   586 git status
   587 git checkout tickets/DM-365
   588 git checkout tickets/DM-365
   589 git rebase master
   590 gitk
   591 gitk
   592 git checkout tickets/DM-633
   593 git checkout tickets/DM-633
   594 git rebase master
   595 emacs admin/templates/client/qserv.conf
   596 git add admin/templates/client/qserv.conf
   597 git status
   598 git rebase --continue
   599 git status
   600 git rebase --continue
   601 git rebase --skip
   602 gitk
   603 git statuss
   604 git status
   605 meld admin/SConstruct ../qservCLEAN/admin/SConstruct
   606 git add admin/SConstruct
   607 meld tests/python/lsst/qserv/tests/benchmark.py
../qservCLEAN/tests/python/lsst/qserv/tests/benchmark.py
   608 git add tests/python/lsst/qserv/tests/benchmark.py
   609 git rebase --continue
   610 git rebase --skip
   611 git status
   612 gitk
   613 git checkout master
   614 git merge --no-ff tickets/DM-633
   615 gitk
   616 git checkout tickets/DM-706
   617 git rebase master
   618 git status
   619* emacs
   620 meld admin/templates/client/qserv.conf
../qservCLEAN/admin/templates/client/qserv.conf
   621 git add admin/templates/client/qserv.conf
   622 git rebase --continue
   623 git rebase --skip
   624 git status
   625 diff admin/SConstruct ../qservCLEAN/admin/SConstruct
   626 git status
   627 emacs admin/SConstruct
   628 history
   629 diff admin/SConstruct ../qservCLEAN/admin/SConstruct
   630 history|grep cp
   631 diff admin/SConstruct ../qservCLEAN/admin/SConstruct
   632 cp ../qservCLEAN/admin/SConstruct admin/SConstruct
   633 git add admin/SConstruct
   634 git status
   635 meld tests/python/lsst/qserv/tests/benchmark.py
../qservCLEAN/tests/python/lsst/qserv/tests/benchmark.py
   636 git add tests/python/lsst/qserv/tests/benchmark.py
   637 git rebase --continue
   638 git rebase --skip
   639 gitk
   640 git checkout master
   641 git merge --no-ff tickets/DM-706
   642 gitk
   643 git cherrypick fb43fadd
   644 git cherry-pick fb43fadd
   645 gitk
   646 cd ..
   647 man diff
   648 man diff
   649 diff -r -X .git qservCLEAN qservNEW
   650 diff -r qservCLEAN qservNEW|more
   651 diff -r -q qservCLEAN qservNEW|more
   652 cd qservNEW
   653 git status
   654 git push --force origin master
   655 gitk
   656 bg
   657 git checkout tickets/DM-706
   658 git push --force origin tickets/DM-706
   659 git checkout tickets/DM-633
   660 git push --force origin tickets/DM-633
   661 git checkout tickets/DM-365
   662 git push --force origin tickets/DM-365
   663 git checkout tickets/DM-510
   664 git push --force origin tickets/DM-510
   665 git checkout tickets/DM-623
   666 git push --force origin tickets/DM-623
   667 gitk
   668 git checkout master
   669 gitk
   670 cd ..
   671 ll
   672 mv qservCLEAN qservBEFORE
   673 mv qservNEW qservAFTER
   674 gitCloneQserv
   675 cd qserv
   676 gitk

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1