ELPA screwup

ELPA screwup

[Leo Liu]

Hi all,

Just now merging easy-kill updates into ELPA somehow all files are
merged into elpa/admin overriding things there.

How could I fix this? (It seems cannot reset HEAD to before my push).

Sorry about this. The process has been smooth in the past so I was
surprised to discover otherwise.

Leo

Re: ELPA screwup

[Dmitry Gutov]

Leo Liu <sdl.web@gmail.com> writes:

> Just now merging easy-kill updates into ELPA somehow all files are
> merged into elpa/admin overriding things there.

That's weird. I wonder how you perform the merges.

> How could I fix this? (It seems cannot reset HEAD to before my push).

'git revert 6e73bbb -m 1' seems to be what you're looking for.

Although maybe we'd prefer someone with admin access to force push the
result of 'git reset --hard a1fe7f0'.

Re: ELPA screwup

[Leo Liu]

On 2014-04-22 05:25 +0400, Dmitry Gutov wrote:
>> Just now merging easy-kill updates into ELPA somehow all files are
>> merged into elpa/admin overriding things there.
>
> That's weird. I wonder how you perform the merges.

I did: git pull -s subtree easy-kill master

where easy-kill is a remote.

>> How could I fix this? (It seems cannot reset HEAD to before my push).
>
> 'git revert 6e73bbb -m 1' seems to be what you're looking for.
>
> Although maybe we'd prefer someone with admin access to force push the
> result of 'git reset --hard a1fe7f0'.

Thanks I'll wait a bit before using revert.

Leo

Re: ELPA screwup

[Stefan Monnier]

> Although maybe we'd prefer someone with admin access to force push the
> result of 'git reset --hard a1fe7f0'.

You'd have to open a ticket on savannah for that.  And it could bring
trouble to people pulling from that branch.  So ... let's not.


        Stefan

Re: ELPA screwup

[Leo Liu]

On 2014-04-21 23:20 -0400, Stefan Monnier wrote:
>> Although maybe we'd prefer someone with admin access to force push the
>> result of 'git reset --hard a1fe7f0'.
>
> You'd have to open a ticket on savannah for that.  And it could bring
> trouble to people pulling from that branch.  So ... let's not.
>
>
>         Stefan

If I did a revert and do subtree again it says: Already up-to-date and
refuse to merge. What to do?

Thanks,
Leo

Re: ELPA screwup

[Leo Liu]

On 2014-04-22 11:45 +0800, Leo Liu wrote:
> If I did a revert and do subtree again it says: Already up-to-date and
> refuse to merge. What to do?

I have done my best to fix it. Sorry if there are remaining issues.

Very sorry about this misstep,
Leo

Re: ELPA screwup

[Thien-Thi Nguyen]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

() Leo Liu <sdl.web@gmail.com>
() Tue, 22 Apr 2014 16:42:56 +0800

   I have done my best to fix it.

I'm no Git expert and would like to avoid trouble in the future.
Could you please summarize what happened, including the commands
issued?

-- 
Thien-Thi Nguyen
   GPG key: 4C807502
   (if you're human and you know it)
      read my lisp: (responsep (questions 'technical)
                               (not (via 'mailing-list)))
                     => nil

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: ELPA screwup

[Stefan Monnier]

> I have done my best to fix it. Sorry if there are remaining issues.

No problem, thank you.  If we could figure out why it went wrong, it
would help avoid the problem in the future.

Of course, using `elpa' as the upstream rather than a separate branch to
which you merge occasionally would completely circumvent the problem ;-)

BTW, could you please fix easy-kill/test.el by adding to it the
regular header?


        Stefan

Re: ELPA screwup

[Leo Liu]

On 2014-04-22 10:36 -0400, Stefan Monnier wrote:
> No problem, thank you.  If we could figure out why it went wrong, it
> would help avoid the problem in the future.

Kinda hard for me to dig into what went wrong. I repeated the `git pull
-s subtree ...' and it worked this time. Try adding the
packages/easy-kill/ and git complained the prefix already exists.

I guess I just have to double check changes were made to the correct
subdirectory.

> Of course, using `elpa' as the upstream rather than a separate branch
> to which you merge occasionally would completely circumvent the
> problem ;-)

Yes, eventually that should happen.

> BTW, could you please fix easy-kill/test.el by adding to it the
> regular header?

Fixed.

Thanks,
Leo

Re: ELPA screwup

[Leo Liu]

On 2014-04-22 12:58 +0200, Thien-Thi Nguyen wrote:
> I'm no Git expert and would like to avoid trouble in the future.
> Could you please summarize what happened, including the commands
> issued?

I have easy-kill as a remote on the elpa repo and this morning I ran
'git pull -s subtree easy-kill master' and pushed. The same command that
worked previously somehow managed to merge changes into the admin/
directory.

It seems the best option to correct this is to reset head to before the
merge and do the subtree merge right. The second best option (which is
what I did) seems to be git mv things to the right subdirectory and
restore deleted files if any.

Leo