[Kde-graphics-devel] Re: kdegraphics git: Summary, part 2. Repositories.

[Pino Toscano]

Hi,

Alle martedì 11 gennaio 2011, Marcel Wiesweg ha scritto:
> first of all we need to collect okular's predecessors. As you said,
> okular came from a kpdf branch, so kpdf's repo will go into okular I
> think?

basically the situation was:
kpdf/trunk -> kpdf/annotations -> okular/trunk

> What is the situation regarding kviewshell? Ok to include its history
> to okular?

We just use some sources of it in the dvi generator. Not sure how to 
pick best their history, hm, maybe importing it as a branch and then 
merging it to trunk in the revision where the sources are copied? Other 
ideas? Albert, what do you think?

> > - there are some revisions in which new files are (re)added, but
> > those
> > 
> >   files existed already, and were just modified; few examples:
> >   88d32391, e02e17cd1, a15937e16, 9ec727e809, 9971fda361,
> >   f3f8048572, 12443fc9, 819add1e3, ab68da364cc, b0ac82c7,
> >   5a58f6ea8, 4c6cec01, d1154ad2, 0d49789e6.
> >   Looks like some commits after 7a87eff309 (where I can see a
> >   refs/backups/r650477/heads/master) suffer from this issue.
> 
> There is a break in the history after the commit you mention. The
> problem is this SVN commit:
> "r650477 | pino | 2007-04-04 19:38:51 +0200 (Wed, 04 Apr 2007) | 4
> lines Changed paths:
>    A /trunk/KDE/kdegraphics/okular (from
> /trunk/playground/graphics/okular:650474)
> Okular comes back home, kdegraphics."
> 
> Normally, git2svn will reseat the master branch and the history is
> fine.
> 
> Niko, any idea? The svn2git output for this commit may give a hint.

Weird this commit caused issues, especially that was not the first move 
commit in okular's history...

> > - a0fa408c6 is the first revision, while it cannot be
> > 
> >   (6eb127e82 is the first, but see below)
> 
> If you look closely, this is a single commit. I see some special
> treatment in the rules file, with min/max revisions. Something wrong
> there?

Oh indeed. That also reminds me that "kde3" branch is not needed.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-graphics-devel/attachments/20110113/b0ea0f52/attachment.sig