From: Ike D. <ike...@gm...> - 2015-05-06 04:55:30
|
On Tue, May 05, 2015 at 07:31:40PM -0300, Peter Cordes wrote: > On Tue, May 05, 2015 at 09:34:40AM +0200, Ike Devolder wrote: > > > Ike, would you want to rebase your git repo with more useful history? > > > If yes, I'll include your branch of the code in my efforts, so we have > > > a repo where all three code branches are in the same repo, as git > > > branches. (par2-cmdline CVS, par2tbb, and BlackIkeEagle). > > > > What do you mean 'more usefull history'. The multithreading part that > > was added on sourceforge was deliberatly skipped. The fixes and > > improvements continued from the last public release. > > Useful as in without flipping between Unix and DOS line endings, > which hides the actual history of lines. I get your point, but on the other hand, I'm not a big fan of rewriting history. The mistakes made are there and should not be hidden in my oppinion. On the other hand if there is a new Parchive organisation created on github it would be a good time to clean things up. But rewriting history also hides things. > > In your tree, commit 98fe1f0f442ecd7262bb65f06d49827c6db5180d replaces > the whole file, instead of just the actual change (from my repo after > git filter-branch): > > ------------------------------ creatorpacket.cpp ------------------------------ > index 91327eb..4fa9f02 100644 > @@ -30,2 +29,0 @@ static char THIS_FILE[]=__FILE__; > -string creator = "Created by " + version + "."; > - > @@ -39,0 +38,2 @@ bool CreatorPacket::Create(const MD5Hash &setid) > + string creator = "Created by " PACKAGE " version " VERSION "."; > + > @@ -46 +46 @@ bool CreatorPacket::Create(const MD5Hash &setid) > - packet->header.hash; // Compute shortly > + //packet->header.hash; // Compute shortly > > This kind of nonsense is pretty common early on in the repo, but we > can fix it by rewriting history. > > > > > > If there are any other forks that would be useful to include, > > > > I've listed some in another reply > > yup, thanks. > > > > Is it usefull to re-import the old cvs ? > > No, but I didn't realize you'd already done it before I started > playing around with it. > > To fix all the flipping between dos/unix line endings, that history > has to get rewritten anyway, but I can use your import. I've transfered par2cmdline from my personal space to the Parchive organisation I've created on github. > > > -- > #define X(x,y) x##y > Peter Cordes ; e-mail: X(peter@cor , des.ca) > > "The gods confound the man who first found out how to distinguish the hours! > Confound him, too, who in this place set up a sundial, to cut and hack > my day so wretchedly into small pieces!" -- Plautus, 200 BC -- Ike |