Re: New trial conversion

[Eric S. R. <es...@th...>]

Daniel J Sebald <dan...@ie...>:
> On 10/22/2017 11:03 PM, Eric S. Raymond wrote:
> >This one is 58ab3388946d9312812c276fa31cc464a617b304
> 
> There is a warning at the end that I don't recall in previous versions:

Well, that was weird. I tried re-pushing it, failed a couple of times,
then discovered that in my procedure for nuking and reinitializing
the upstream repo, it really matters that you have to say "git init --bare .",
if you leave off the last dot the command will appear to succeed but
make a repo that can't be pushed to.

All fixed now. You should be able to clone with

git clone ssh://esr@git.code.sf.net/p/gnuplot/git-main gnuplot-git-main

and not get that error. I just did.

For the record, here's how you clobber a SourceForge git repo:

ssh -t es...@sh... create

You would have to substitute your own account ID for 'esr'. This
command will give you access to a special-purpose restricted shell.
Once in it,

cd /home/git/p/gnuplot

You should see a directory there named git-main.git.  This is the git repo.
Do this to clobber it:

cd git-main.git
rm -fr *
git init --bare .

After this sequence,

git push --force --mirror

from within your local conversion will work, pushing all its branches
and tags to SourceForge

> I'm guessing, from the graph generated by gitg, that master should coincide
> with tag "git-conversion" as it currently stands.

Correct.

> It looks to me, in gitg, that branch52 is coming from what would be
> considered "master".

Also correct.

The ugly part is that all the other branch joins are in obviously wrong places.
I will need to identify graft points for the other branches and move them.

Then I'll have to check that each regrafted branch checks out to the
same working tree as the CVS original. I'm worried about this part
because the root tags were so corrupted; worst case we may not be able
to save any branches other than master and 5.2.

> These graphs are such a difficult thing to following in something like gitk
> or gitg, and it's because those tools aren't really geared for nice display
> of branching.  If I select one of the tags in gitg, the graph jumps there
> but it only displays commits up to that tag.  It doesn't put in context with
> all other branches.

Alas, this is so.  Getting a usable visualization of the essential
structure of a repo is something I don't know how to do.  reposurgeon
has a graph command that fenerates a DOT visualization, but for any
real repo the diagram is infeasibly huge.

> I've tried using cvsgraph to generate a graph of where the CVS branches
> occur, but no luck.

I didn't know this tool existed. Unfortunately it looks both complicated to
use and subject to the same problem as my graph command.

> >We're going to have to do 4 or 5 similar grafts to restore the tree to
> >correct topology.
> 
> Is it possible to rebase some things after conversion to correct that paths?

Yes, but just as easy to do the equivalent of the rebase in the
conversion script.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

My work is funded by the Internet Civil Engineering Institute: https://icei.org
Please visit their site and donate: the civilization you save might be your own.