Hi Folks, <br><br>Following our recent discussion ... see <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 the associated user is "commontk" and not anymore "pieper" !<br>
<br>The history have been cleaned ! See stats below:<br><br><font size="1">pieper/CTK total size: <b>40M</b> objects count: 7788 time to clone: ~22s<br>commontk/CTK total size: <b> </b></font><font size="1"><b>6.2M</b></font><font size="1"> objects count: 5811 time to clone: ~8s</font><br>
<font size="1">(total size obtained using: (du -ksh .)</font><br><br><br>DCMTK, Log4Qt, log4cpp, ZMQ have been removed from it and are now hosted in their own repository. <br>See :<br> <a href="http://github.com/commontk/PythonQt">http://github.com/commontk/PythonQt</a><br>
<a href="http://github.com/commontk/Log4Qt">http://github.com/commontk/Log4Qt</a><br> <a href="http://github.com/commontk/DCMTK">http://github.com/commontk/DCMTK</a><br><br><b>Please pay attention to the following</b> <b>- Since the history has been rewritten, consider the following:</b><br>
<br>Any repository cloned using <b>git@github.com:pieper/CTK.git </b>should be considered as <b>UNUSABLE</b>. <br> -> Delete it and re-clone it from <b>git@github.com:commontk/CTK.git</b><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 to the <a href="http://github.com/commontk">github.com/commontk</a><br>The existing <a href="http://github.com/pieper">github.com/pieper</a> is obsolete and will be deleted soon. (Steve: Can you remove the accesses ?)<br>
<br><br><br><br>In case you have <b>COMMITS</b> which are <b>NOT YET PUSHED</b> to the main repository. <br><br>For example:<br><pre><tt><tt> A---B---C my_work_in_progress<br> /<br> D---E---F---G master</tt></tt></pre>
<br>1) Make sure you apply you backup the stash <br><br><font face="Courier New">git stash apply && git commit </font>-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><font face="Courier New">git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative<br>
<br>Example:<br><br>* <b>ad9957a</b> - (HEAD, master) ENH: wip (7 minutes ago) <Jean-Christophe Fillion-Robin><br>* ac4abdb - ENH: Added feature2 (23 minutes ago) <Jean-Christophe Fillion-Robin><br>* 2499a9e - ENH: Added feature1 (23 minutes ago) <Jean-Christophe Fillion-Robin><br>
* <b>ccdb850</b> - (origin/master) COMP: Superbuild - ExternalProject - git update step should also perform a "git pull" (9 hours ago) <Jean-Christophe Filli<br>* 8f567e7 - ...<br></font><br><br>3) Create a patch with all your local commits<br>
<br><font face="Courier New">git format-patch -k --stdout </font><font face="Courier New"><b>ccdb850</b></font><font face="Courier New">..</font><font face="Courier New"><b>ad9957a</b></font><font face="Courier New"> > ~/work_in_progress_ctk.patch<br>
<br><br></font>4) Delete this CTK folder and clone the new repository<br><br><font face="Courier New">cd ..<br><br></font><font face="Courier New">git clone git@github.com:commontk/CTK.git</font><font face="Courier New"> && cd CTK<br>
<br>cat ~/</font><font face="Courier New">work_in_progress_ctk.patch | git am -3 -k</font><br><font face="Courier New"><br></font><br>Here it is - You should now be able to work as usual ... <br><br><br><br><br><br><b>PLEASE Re-Fork</b> !<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><font size="1"><span style="font-family: courier new,monospace;"> YourName/CTK</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;"> |</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> ---> forked from commontk/CTK</span></font><br><br><font face="Courier New"><br></font><br>Any question, let me know.<br><br>Thks<br>
Jc<br clear="all"><br>-- <br>Phone: 1-518-836-2174<br>Ext: 304<br>