server-1.2-branch accidentally merged with master

[Carl Worth]

On Tue, 10 Oct 2006 14:35:27 -0600, Ray Lehtiniemi wrote:
> On Tuesday 10 October 2006 14:03, Alan Coopersmith wrote:
>
> > I tried all that, and it seems to have worked in my copy, but won't
> > let me push to the master on fd.o - do I need someone with fd.o
> > admin privs to do this there?
>
> yes, that would probably be the best solution.

That would work, but I think you should also be able to achieve this
remotely by forcing the push with an initial '+':

	git push <repository> +server-1.2-branch

It's not something to get into the habit of, (since it is destructive---
some commits that are currently reachable by fetching that branch will
no longer be), but it is a mechanism for forecfully making mistakes go
away.

And as Ray explained before, it will also force users that previously
fetched the mistake to also fetch one time with a + to fix their
repositories.

All in all, it's a pretty hard hammer to hit with. In particular, if
anybody has pushed any changes after your mistaken commit then this
would throw them away.

So it's really a per-project decision whether mistakes should be fixed
this way or by instead just adding new commits that put things back to
where they should be, (leaving some garbage states in the history).

Personally, I'd think that a mistaken merge is a particularly ugly
thing to have in the history, and this would be worthwhile to fix,
(especially if caught very quickly). But my opinion shouldn't carry
any weight since I'm not actively working in the xorg repository at
all.

-Carl
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20061010/43f7e47c/attachment.pgp>