preliminary git repository for testing

[Marcel Wiesweg]

Hi,

I have pushed a ruleset for git migration, which is apparently working, to
kde-ruleset, and file the sysadmin request.

A preliminary repository, generated yesterday, is available for testing on
huey.kde.org:
ssh [hidden email]
cd mwiesweg/digikam
(See http://community.kde.org/Sysadmin/DeveloperAccessForRuleWriting for info)

You can also download it with scp, but it's 490 MB, so I did not do that yet.

The repository seems to be all right, log ranges from Dec 15th 2010 to Apr
23rd 2004, with the birth of kipi-plugins. But I did not yet check it with
gitk or any other tool which may be suitable.

We should also decide if we want kipi-plugins' history in master or a
dedicated branch.

I suggest the following procedure:
1) We wait until the repository is setup by the sysadmins.
2) Someone (Gilles) fixes a date, perhaps next week, after 1.7.0 release and
merging changes from trunk to branch is done.
3) At this day our SVN repository is closed for commits.
4) I will run again svn2git, scp the repository to my machine,
 and push it to our shiny new git repository.
5) We are all happy to use git!

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[kunal ghosh]

Hi marcel,

Is this kind of like a temporary place where kde projects put up their code

and the kde sysadmins create git repo's out of them ?

Been using git-svn for a long time, waiting to use git.

pleased to see that the migration is finally underway.

regards,

Kunal

On Thu, Dec 16, 2010 at 6:47 PM, Marcel Wiesweg <[hidden email]> wrote:

Hi,

I have pushed a ruleset for git migration, which is apparently working, to
kde-ruleset, and file the sysadmin request.

A preliminary repository, generated yesterday, is available for testing on
huey.kde.org:
ssh [hidden email]
cd mwiesweg/digikam
(See http://community.kde.org/Sysadmin/DeveloperAccessForRuleWriting for info)

You can also download it with scp, but it's 490 MB, so I did not do that yet.

The repository seems to be all right, log ranges from Dec 15th 2010 to Apr
23rd 2004, with the birth of kipi-plugins. But I did not yet check it with
gitk or any other tool which may be suitable.

We should also decide if we want kipi-plugins' history in master or a
dedicated branch.

I suggest the following procedure:
1) We wait until the repository is setup by the sysadmins.
2) Someone (Gilles) fixes a date, perhaps next week, after 1.7.0 release and
merging changes from trunk to branch is done.
3) At this day our SVN repository is closed for commits.
4) I will run again svn2git, scp the repository to my machine,
 and push it to our shiny new git repository.
5) We are all happy to use git!

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

--
regards
-------
Kunal Ghosh
Dept of Computer Sc. & Engineering.
Sir MVIT
Bangalore,India

Blog:kunalghosh.wordpress.com
Website:www.kunalghosh.net46.net

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> Hi marcel,
> Is this kind of like a temporary place where kde projects put up their code
> and the kde sysadmins create git repo's out of them ?

No, it's just some server made available by SSH because the conversion
requires to download the full SVN repository, 65 GB.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> I have pushed a ruleset for git migration, which is apparently working, to
> kde-ruleset, and file the sysadmin request.

Well, the main branch works, but there are problems on the branch.
The log for some file stops on Dec 11th, when they were moved.
git blame seems to work though.
Any help is appreciated.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[kunal ghosh]

On 12/16/2010 07:14 PM, Marcel Wiesweg wrote:

I have pushed a ruleset for git migration, which is apparently working, to
kde-ruleset, and file the sysadmin request.

Well, the main branch works, but there are problems on the branch.
The log for some file stops on Dec 11th, when they were moved.
git blame seems to work though.
Any help is appreciated.

the command to get the source code from the temporary git repo is
git clone [hidden email]

the clone will download about 80 MB of data.

TO DO :
check git commands against this repo,
to see if all of them work .

@marcel any corrections to above TODO ?

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2010/12/16 Marcel Wiesweg <[hidden email]>:

> Hi,
>
> I have pushed a ruleset for git migration, which is apparently working, to
> kde-ruleset, and file the sysadmin request.
>
> A preliminary repository, generated yesterday, is available for testing on
> huey.kde.org:
> ssh [hidden email]
> cd mwiesweg/digikam
> (See http://community.kde.org/Sysadmin/DeveloperAccessForRuleWriting for info)
>
> You can also download it with scp, but it's 490 MB, so I did not do that yet.
>
> The repository seems to be all right, log ranges from Dec 15th 2010 to Apr
> 23rd 2004, with the birth of kipi-plugins. But I did not yet check it with
> gitk or any other tool which may be suitable.
>
> We should also decide if we want kipi-plugins' history in master or a
> dedicated branch.
>
> I suggest the following procedure:
> 1) We wait until the repository is setup by the sysadmins.
> 2) Someone (Gilles) fixes a date, perhaps next week, after 1.7.0 release and
> merging changes from trunk to branch is done.

Yes, the release date is updated here :

http://www.digikam.org/drupal/about/releaseplan

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> > Well, the main branch works, but there are problems on the branch.
> > The log for some file stops on Dec 11th, when they were moved.
> > git blame seems to work though.
> > Any help is appreciated.

The real repository is mwiesweg/digikam (to be the remote repository),
digikam-work is a working copy (with git clone) I have used to play around.

I think all will work, git fsck did not report any serious problems.
It's just I dont know why the logs of files in the gsoc branch stop at points
where they are moved:

(this is done from branch 2.0 in digikam-work)
git log core/digikam/digikamapp.cpp
gives one commit, Dec 11th. The file move.

git blame core/digikam/digikamapp.cpp
shows lines dating back to 2004.


More serious:
git blame extra/kipi-plugins/jpeglossless/jpegtransform.cpp
Stops on June 30th, as does the log. All history is lost.

I can see in the output from svn-all-fast-export (mwiesweg/svn2git-output),
that the relevant commit 1144580 is recognized as a merge point.

I will start another attempt...
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> (this is done from branch 2.0 in digikam-work)
> git log core/digikam/digikamapp.cpp
> gives one commit, Dec 11th. The file move.

Ok, this is remedied with "git log --follow"

> git log extra/kipi-plugins/jpeglossless/jpegtransform.cpp
> Stops on June 30th, as does the log. All history is lost.
 
Still a problem - now the only I try with an "action recurse" in the rules.
Run can only take a few hours...
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Martin Klapetek]

...should I still commit stuff to svn or wait for the git to become ready?

Marty

On Thu, Dec 16, 2010 at 16:52, Marcel Wiesweg <[hidden email]> wrote:

> (this is done from branch 2.0 in digikam-work)
> git log core/digikam/digikamapp.cpp
> gives one commit, Dec 11th. The file move.

Ok, this is remedied with "git log --follow"

> git log extra/kipi-plugins/jpeglossless/jpegtransform.cpp

> Stops on June 30th, as does the log. All history is lost.

Still a problem - now the only I try with an "action recurse" in the rules.
Run can only take a few hours...

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> ...should I still commit stuff to svn or wait for the git to become ready?

Just continue committing, we ping all committers a few days in advance about
the switch.
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel