[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Tinycc-devel] It seem I pull code in wrong way. How can I revert it

From: Alexander Strasser
Subject: Re: [Tinycc-devel] It seem I pull code in wrong way. How can I revert it?
Date: Sat, 12 Sep 2020 21:45:25 +0200
User-agent: Mutt/1.9.4 (2018-02-28)


On 2020-09-12 21:50 +0800, Pursuer wrote:
> Thanks a lot for your rearranging and advice.

IMHO your first message in this thread was a bit short. E.g.
some people (like me initially) thought, you only might have
a local problem.

> by the way I'm sure I only add tcc.h to the commit "misplaced parenthese 
> around...", So I'm also confused about the side-effect mentioned 
> by Christian Jullien. (In fact I had cloned a new copy before 
> rearranging, In which the additions made by Kyryl on 22_floating_point.c 
> was not removed.)

No idea, what went wrong an why.

Though Git is often not very intuitive, it usually provides all the
tools to let you check what would happen.

Some things that might prevent mistakes like that in future.

Before pushing:

    git push --dry-run
    # Sharply look at the output, what branches, tags would be pushed?
    # Assuming you want to only push one branch, make sure it's only
    # the one branch that will be pushed to the correct remote repo.
    # Copy the commit range displayed for that branch.

    git log --reverse --oneline COMMIT_RANGE_FROM_DRY_RUN
    # commits (oldest to youngest) that will be pushed

    git diff --stat --patch COMMIT_RANGE_FROM_DRY_RUN
    # check the stats and have a quick look over the changed lines

If something comes up above: Investigate, fix and start over.

Once everything looks fine: Push.

Best regards,

> ------------------ Original ------------------
> From:                                                                         
>                                                "tinycc-devel"                 
> <grishka@gmx.de&gt;;
> Date:&nbsp;Sat, Sep 12, 2020 01:54 PM
> To:&nbsp;"tinycc-devel"<tinycc-devel@nongnu.org&gt;;
> Subject:&nbsp;Re: [Tinycc-devel] It seem I pull code in wrong way. How can I 
> revert it?
> avih via Tinycc-devel wrote:
> &gt;
> &gt; While force-pushing is usually possible, I'd argue that at the tcc repo
> &gt; (and generally elsewhere too, but to each his own practices) no one
> &gt; should force push except maybe maintainers and maybe other regular
> &gt; contributors which 100% know what they're doing when force-pushing.
> So I did put on my "maintainer hat" in this case.
> Pursuer2's patch "misplaced parenthese around ..." is now on top of
> mob as it was before his pushes.&nbsp; Kyryl's patch "fix float to u64..."
> still has bugs (<< vs &gt;&gt;) and adds bad formatting unnecessarily.
> To all:
> In the future, please use git cherry-pick or git rebase to put
> your patches on top of the current public mob branch, first.
> And as always:
> * test before you push.
> * don't add tabs and use 4 spaces to indent.&nbsp; (Don't use emacs or
> &nbsp;&nbsp; configure appropriately its automatisms.).
> * don't change lines that you did not change.
> Thanks,
> --- gr
> &gt;
> &gt; I.e. if you want something reverted at the mob repo, please ask here
> &gt; at the mailing list and one of the regulars will judge how to handle
> &gt; the request, IMHO.
> &gt;
> &gt; - avih

reply via email to

[Prev in Thread] Current Thread [Next in Thread]