Re: [mylyn-builds-dev] Changes to BuildsServiceMessageControl, revoke pu

[Benjamin Muskalla <benjamin.muskalla@xxxxxxxxxxx>]

Theoretically you can "delete" commits with git rebase (see the ProGit book). But never, ever do this when you already pushed the changes. The reason is simple: When you already pushed the changes and others picked them up, and you rewrite the history, nobody is able to merge his local changes with the repository as the parent commit is gone. Rebasing locally is something I do everyday (delete commits, squash several commits into one) but never rebase something that is already pushed. The best way is to revert the changes by applying the commit in reverse and commit again. This way people will be able to merge the changes into their local repos.

Ben

On Thu, Dec 16, 2010 at 11:21 PM, Torkild Ulvøy Resheim <torkildr@xxxxxxxxx> wrote:

Hi Steffen,

Thanks :-) I obviously need to learn more about Git so I downloaded the "Pro Git" book in EPUB format. If anyone is interested it can be found at http://progit.org/2010/05/17/progit-for-the-ipad.html
--

Torkild Ulvøy Resheim
Consultant / Eclipse Committer / Senior Software Engineer
Itema AS - http://itema.no

Den 16. des. 2010 kl. 23:01 skrev Steffen Pingel <steffen.pingel@xxxxxxxxxxx>:

> There is probably a way to revert history but would it be easiest to
> apply the patch? I can take a look tomorrow morning (the task is
> already blue in my list...).
>
> Steffen
>
>
> On Thu, Dec 16, 2010 at 1:33 PM, Torkild Ulvøy Resheim
> <torkildr@xxxxxxxxx> wrote:
>> Hi guys,
>>
>> I accidentally pushed a (minor) change to BuildsServiceMessageControl that should have not been in before a patch to bug 330064 was applied (http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.builds.git/commit/?id=2b6765235b7673206f3e729f4f8b2004c46d50c9). Is there a way of revoking this push without having to change the code and do another round?
>>
>> Best regards,
>> --
>> Torkild Ulvøy Resheim
>> Consultant / Eclipse Committer / Senior Software Engineer
>> Itema AS - http://itema.no
>>
>>
>>
>>
>> _______________________________________________
>> mylyn-builds-dev mailing list
>> mylyn-builds-dev@xxxxxxxxxxx
>> http://dev.eclipse.org/mailman/listinfo/mylyn-builds-dev
>>
>>
>
>
>
> --
> Steffen Pingel
> Committer, http://eclipse.org/mylyn
> Senior Developer, http://tasktop.com
> _______________________________________________
> mylyn-builds-dev mailing list
> mylyn-builds-dev@xxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/mylyn-builds-dev
_______________________________________________
mylyn-builds-dev mailing list
mylyn-builds-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/mylyn-builds-dev

--
Benjamin Muskalla
Tasktop Technologies
+49 721 33 59 204
http://tasktop.com