No problem - sounds good<br><br>In the mean time, after I updated <a href="http://ohloh.net/p/commontk">ohloh.net/p/commontk</a>, I noticed that the author name / email weren't <br>consistent. Some were in double. <br>
<br>I am almost done running my scripts. <br><br>Then I will <br> - re-push a clean version of CTK repo in the next hour. <br> - then, everybody would be able to re-fork and re-import his commit. <br><br>I promise it the last time ! <br>
<br>I keep you posted. <br><br>Thks<br>Jc<br><br><br><br><div class="gmail_quote">On Mon, Jun 14, 2010 at 10:49 AM, Steve Pieper <span dir="ltr"><<a href="mailto:pieper@bwh.harvard.edu">pieper@bwh.harvard.edu</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">Excellent info Jc - thanks for getting this organized so quickly!<br>
<br>
I deprecated the old repo (changed the README and removed the collaborators) so hopefully there will be minimal confusion.<br>
<br>
-Steve<div><div></div><div class="h5"><br>
<br>
On Jun/14/10 6:24 AM, Jean-Christophe Fillion-Robin wrote:<br>
</div></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div><div></div><div class="h5">
Hi Folks,<br>
<br>
Following our recent discussion ... see<br>
<a href="http://github.com/pieper/CTK/issues#issue/19" target="_blank">http://github.com/pieper/CTK/issues#issue/19</a><br>
<br>
The "master/original/official" repository is still hosted on github but<br>
the associated user is "commontk" and not anymore "pieper" !<br>
<br>
The history have been cleaned ! See stats below:<br>
<br>
pieper/CTK total size: *40M* objects count: 7788 time to<br>
clone: ~22s<br>
commontk/CTK total size: * **6.2M* objects count: 5811 time to<br>
clone: ~8s<br>
(total size obtained using: (du -ksh .)<br>
<br>
<br>
DCMTK, Log4Qt, log4cpp, ZMQ have been removed from it and are now hosted<br>
in their own repository.<br>
See :<br>
<a href="http://github.com/commontk/PythonQt" target="_blank">http://github.com/commontk/PythonQt</a><br>
<a href="http://github.com/commontk/Log4Qt" target="_blank">http://github.com/commontk/Log4Qt</a><br>
<a href="http://github.com/commontk/DCMTK" target="_blank">http://github.com/commontk/DCMTK</a><br>
<br>
*Please pay attention to the following* *- Since the history has been<br>
rewritten, consider the following:*<br>
<br>
Any repository cloned using *git@github.com:pieper/CTK.git *should be<br>
considered as *UNUSABLE*.<br>
-> Delete it and re-clone it from *git@github.com:commontk/CTK.git*<br>
<br>
Please, re-fork also your repository. See instruction at the end.<br>
<br>
Note also that all users should have been already added as collaborator<br></div></div>
to the <a href="http://github.com/commontk" target="_blank">github.com/commontk</a> <<a href="http://github.com/commontk" target="_blank">http://github.com/commontk</a>><br>
The existing <a href="http://github.com/pieper" target="_blank">github.com/pieper</a> <<a href="http://github.com/pieper" target="_blank">http://github.com/pieper</a>> is obsolete<div><div></div><div class="h5"><br>
and will be deleted soon. (Steve: Can you remove the accesses ?)<br>
<br>
<br>
<br>
<br>
In case you have *COMMITS* which are *NOT YET PUSHED* to the main<br>
repository.<br>
<br>
For example:<br>
<br>
A---B---C my_work_in_progress<br>
/<br>
D---E---F---G master<br>
<br>
<br>
1) Make sure you apply you backup the stash<br>
<br>
git stash apply && git commit -a -m "WIP"<br>
<br>
<br>
2) Let's find out the SHA1 of:<br>
- your last local commit<br>
- the parent of your first local commit<br>
<br>
git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s<br>
%Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative<br>
<br>
Example:<br>
<br>
* *ad9957a* - (HEAD, master) ENH: wip (7 minutes ago) <Jean-Christophe<br>
Fillion-Robin><br>
* ac4abdb - ENH: Added feature2 (23 minutes ago) <Jean-Christophe<br>
Fillion-Robin><br>
* 2499a9e - ENH: Added feature1 (23 minutes ago) <Jean-Christophe<br>
Fillion-Robin><br>
* *ccdb850* - (origin/master) COMP: Superbuild - ExternalProject - git<br>
update step should also perform a "git pull" (9 hours ago)<br>
<Jean-Christophe Filli<br>
* 8f567e7 - ...<br>
<br>
<br>
3) Create a patch with all your local commits<br>
<br>
git format-patch -k --stdout *ccdb850*..*ad9957a* ><br>
~/work_in_progress_ctk.patch<br>
<br>
<br>
4) Delete this CTK folder and clone the new repository<br>
<br>
cd ..<br>
<br>
git clone git@github.com:commontk/CTK.git && cd CTK<br>
<br>
cat ~/work_in_progress_ctk.patch | git am -3 -k<br>
<br>
<br>
Here it is - You should now be able to work as usual ...<br>
<br>
<br>
<br>
<br>
<br>
*PLEASE Re-Fork* !<br>
<br>
1)<br>
<br>
Go on <a href="http://github.com/YourName/CTK" target="_blank">http://github.com/YourName/CTK</a><br>
<br>
.... and delete your CTK fork.<br>
<br>
See "Deleting the forked repository" on <a href="http://help.github.com/forking/" target="_blank">http://help.github.com/forking/</a><br>
<br>
2)<br>
<br>
Go on <a href="http://github.com/commontk/CTK" target="_blank">http://github.com/commontk/CTK</a><br>
<br>
.. and fork the repository<br>
<br>
Then, if you go on <a href="http://github.com/YourName/CTK" target="_blank">http://github.com/YourName/CTK</a><br>
it should indicates:<br>
<br>
YourName/CTK<br>
|<br>
---> forked from commontk/CTK<br>
<br>
<br>
<br>
Any question, let me know.<br>
<br>
Thks<br>
Jc<br>
<br>
--<br>
Phone: 1-518-836-2174<br>
Ext: 304<br>
<br>
<br>
<br></div></div><div class="im">
_______________________________________________<br>
Ctk-developers mailing list<br>
<a href="mailto:Ctk-developers@commontk.org" target="_blank">Ctk-developers@commontk.org</a><br>
<a href="http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers" target="_blank">http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers</a><br>
</div></blockquote>
</blockquote></div><br><br clear="all"><br>-- <br>Phone: 1-518-836-2174<br>Ext: 304<br>