patch, 3 partsFix svn mirroring of branches + more...

Petr, rorcz-admins,

Today I've spot that rorcz does not propagate svn branches to git namespace and tried to fix it.

Please apply and thanks, Kirill

Kirill Smelkov (3):
  taskd/clone: Store git-svn refs under svn-origin remote
  taskd/clone: ask git-svn to store branches under svn-origin/heads/*
    instead of svn-origin/*
  Revert "Finalized fix, we can't git fetch any longer."

 jobd/update.sh |    1 +
 taskd/clone.sh |   12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

Previously git-svn stored everything right under refs/remotes/ , and now I'm putting svn-mirrored refs under refs/remotes/svn-origin/ .

This makes sense, since it helps debugging svn-mirroring problems - e.g. at present we don't forward to visible git namespace svn branches at all.

Cc: Andrew Steinborn <g33kdyoo@gmail.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>
---
 taskd/clone.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

The trick originally suggested by Mikls Vajna does the following:

    refs/remotes/svn-origin/heads/*     ->  refs/heads/*
    refs/remotes/svn-origin/trunk       ->  refs/heads/master
    refs/remotes/svn-origin/tags/*      ->  refs/tags/*

The problem is git-svn now stores svn branches under refs/remotes/svn-origin/* (not refs/remotes/svn-origin/heads/* as we used to expect), and so the first mapping does nothing, and we end up without svn branches in refs/heads/ namespace.

So, to avoid the problem let's ask git-svn to put svn branches under svn-origin/heads/* -- then our mapping will work as expected, and it will fix girocco problem of not propagating svn branches (except trunk) to git refs/heads/ namespace.

Note: we can't write ``+refs/remotes/svn-origin/*:refs/heads/*'' in the
mapping instead, because then it will recursively put everything from
under svn-origin/ into refs/heads/ , at least including tags/ .

( Eric, at least it seems a bit unflexible for storing svn branches right under
  $prefix/ -- as you can see for automated git mirroring of svn repos, I
  had to tweak git config by hand... )

Cc: Andrew Steinborn <g33kdyoo@gmail.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>
Cc: Eric Wong <normalperson@yhbt.net>
---
 taskd/clone.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

This reverts commit 1b442bd3713465e05e7e1a2c46d2439508dd2d4e.

Andrew forgot to revert this when he was reverting his experiments in 1cb526 (Readded the trick.) .

Andrew, please be careful not to introduce regressions - without this fetch, svn mirrors won't update their git refs, and so would become stale.

Cc: Andrew Steinborn <g33kdyoo@gmail.com>
---
 jobd/update.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

+ pasky@suse.cz

On Sat, Sep 18, 2010 at 01:58:51PM +0400, Kirill Smelkov wrote:

Silence... But it fixes regression and recent breakage... Anyone?!!!