[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    Re: [Kde-pim] Push access to kdepim and kdepimlibs suspended
From:       Ben Cooksley <bcooksley () kde ! org>
Date:       2013-01-23 6:48:35
Message-ID: CA+XidOFEO8nHV3Ynrru5K6DKrDqcZRzpzQw2wvsMnj3wyJrJkw () mail ! gmail ! com
[Download RAW message or body]

On Wed, Jan 23, 2013 at 7:33 PM, Ben Cooksley <bcooksley@kde.org> wrote:
> Hi all,
>
> Just a quick notice that due to a accidental merge from KDE/4.10 into
> master in both the kdepim and kdepimlibs repositories, both have been
> locked.
> A force push has already been performed to reverse the changes,
> however it has been left locked to ensure that the changes are not
> reintroduced accidentally (changes are also needed on various
> infrastructure systems, which in themselves are not capable of
> handling a force push).
>
> Unfortunately, due to the manner in which the change occurred, it is
> difficult to block it reoccurring at this time.

Just a quick follow up, the following four commands should help those
who need to fix their checkouts.
You will need to fix your checkout if you pulled at any time from
17:00 UTC yesterday until now.

Steps 1 and 4 may be skipped if you are not currently on KDE/4.10.

- If you have the KDE/4.10 branch checked out now, change to another:
  git checkout master

- Remove the tainted KDE/4.10 branch you have locally:
  git branch -D KDE/4.10

- Fetch all changes from the server:
  git remote update

- Return to KDE/4.10:
  git checkout KDE/4.10

Regards,
Ben
_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
[prev in list] [next in list] [prev in thread] [next in thread]