search for: squash

On 6/2/2016 1:48 PM, via llvm-dev wrote: > Mehdi Amini via llvm-dev <llvm-dev at lists.llvm.org> writes: > >> Github has an automatic "squashed" mode for pull requests now, I >> haven't tested in practice but it may help. > IMHO squashed commits are a bad idea from a bisect perspective. One of > the great benefits of git is the easy of creating small, > logically-independent commits that can be bisected. Squashi...

...pov via llvm-dev <llvm-dev at lists.llvm.org> wrote: > On Thu, Jun 25, 2020 at 11:22 AM Zachary Turner via llvm-dev <llvm-dev at lists.llvm.org> wrote: >> What this means for LLVM is that everyone will have to completely stop using history rewriting operations. No more rebase, squash, amend, etc. > > This is also incorrect. Most GitHub projects I work on use a rebase-oriented workflow without issue, so clearly that's possible... > > The only issue in this area that I'm aware of is that you can't easily see what changed between two revisions of a pull req...

Just to clarify: All the LLVM incubator repositories have "enforce linear history" enabled. Neither "Squash and Merge" or "Rebase and Merge" results in a Merge commit in the git history. Steve On Fri, Sep 11, 2020 at 3:32 PM Hubert Tong < hubert.reinterpretcast at gmail.com> wrote: > On Fri, Sep 11, 2020 at 6:12 PM Renato Golin <rengolin at gmail.com> wrote: > >>...

...returned from linux.conf.au, I'm starting to > organize the 3.20 queue. I've merged this branch into my virtio-next > branch. > > Cheers, > Rusty. Thanks, good to know. I tweaked some patches since due to test failure reports by Gerd. Updated patches are tagged "post-squash", if you want to see what changed, see fixup patches in the series tagged "pre-squash". Or you can look at my tree: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git virtio-next is pre-squash. git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhos...

...returned from linux.conf.au, I'm starting to > organize the 3.20 queue. I've merged this branch into my virtio-next > branch. > > Cheers, > Rusty. Thanks, good to know. I tweaked some patches since due to test failure reports by Gerd. Updated patches are tagged "post-squash", if you want to see what changed, see fixup patches in the series tagged "pre-squash". Or you can look at my tree: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git virtio-next is pre-squash. git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhos...

On Fri, 11 Sep 2020 at 19:32, Hubert Tong via llvm-dev < llvm-dev at lists.llvm.org> wrote: > There seems to be a split between those who prefer to curate commits >> locally and present them in the PR (i.e. Method 3) as they are to be >> committed (i.e. squash/amend/etc from my workstation and push the result), >> and those who seem to feel that it is better to avoid "git rebase" and "git >> commit --amend" and let github handle rewriting the history with the commit. >> > Are these primarily developers or reviewer...

On Fri, Sep 11, 2020 at 6:53 PM David Blaikie <dblaikie at gmail.com> wrote: > Is there any observable difference between "Squash and Merge" or "Rebase > and Merge" when "enforce linear history" is enabled, then? > "Squash and Merge" will only generate one commit. > > On Fri, Sep 11, 2020 at 3:45 PM Stephen Neuendorffer via llvm-dev < > llvm-dev at lists.llvm.org> wrot...

...iven time. > There are multiple ways to linearize the history. > > You can simply disallow merges I guess but that seems not much better > than just sticking with SVN. GitHub's pull request model kind of breaks > down if you can't do merges. Github has an automatic "squashed" mode for pull requests now, I haven't tested in practice but it may help. -- Mehdi

The LLVM incubator projects have been using github PRs for reviews and so far haven't really seen any significant issues. The biggest confusion so far has not been with reviews but with the difference between "rebase and merge" and "squash and mere". We have used basically 3 different processes: Method 1: start a review with one commit on a new branch (typically in a personal repository 'fork'). Respond to review comments by adding additional commits on the same branch. Then you want to "Squash and Merge"....

...work on or with LLVM for many reasons. The most cited ones are the modern code base, the liberal BSD like license and the modularity. Around LLVM a large ecosystem was built that includes subprojects like dragonegg, vmkit, Polly, libc++, safecode and many more. o What is the LLVM Meetup and Bug Squashing? It is a casual meetup to get to know people working on LLVM or interested to learn about LLVM. There is no fixed schedule. We just meet to get to know each other and to discuss. No previous knowledge about LLVM is required. This time we meet at IRILL, where we will have plenty of tables,...

...through review? We don't enforce that now, so I see no reason to start doing it. Phab reviews, once approved, can have last-minute modifications and direct commits. Often reviewers will reply "LGTM with this nit addressed", which means the author is supposed to fix the code, ammend/squash, and push. A rebase squash of the fixups is slightly more complex if they need to apply to different patches in the series, but the author is *expected* to run a final test on the rebased version *before* pushing. If not, buildbots will break and patches reverted. An author that keeps doing that...

...ople copy this bad example. This also fixes a bug on BE architectures: tag should use cpu_to_le16, not cpu_to_le32. Acked-by: Cornelia Huck <cornelia.huck at de.ibm.com> Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- Just reposting so it's easier to apply. Feel free to squash into previous patch if you think it's neater. include/uapi/linux/virtio_balloon.h | 33 +++++++++++++++++++++++++-------- drivers/virtio/virtio_balloon.c | 19 ++++--------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/include/uapi/linux/virtio_balloon.h b/includ...

So, I am starting to code this CAS block squashing test and I am wondering if this is something that would more likely extend open Solaris (it does require additional info in zfs metadata that is currently reserved space for future, ie zfs revision++) or if I should code against the FUSE tree where it would could be imported. What type of contr...

...ople copy this bad example. This also fixes a bug on BE architectures: tag should use cpu_to_le16, not cpu_to_le32. Acked-by: Cornelia Huck <cornelia.huck at de.ibm.com> Signed-off-by: Michael S. Tsirkin <mst at redhat.com> --- Just reposting so it's easier to apply. Feel free to squash into previous patch if you think it's neater. include/uapi/linux/virtio_balloon.h | 33 +++++++++++++++++++++++++-------- drivers/virtio/virtio_balloon.c | 19 ++++--------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/include/uapi/linux/virtio_balloon.h b/includ...

Leading up to the upcoming orphan removal in EPEL, the EPEL Steering Committee is organizing a Bug Squashing Day. There are 3 main purposes to this day: 1. Identifying owners willing to take over orphaned packages 2. Bug triage, feedback, or fixing various bugs through patch submission, etc. 3. Last but not least, we'll be covering the testing of various packages which need feedback. Additionally...

...gt; > > > Acked-by: Michael S. Tsirkin <mst at redhat.com> > > > > > > > > The affected patch is not upstream yet, right? > > > > I don't know if the tree in question allows rebases - linux-next > > > > does. So ideally it would be squashed to avoid issues during bisect. > > > > Still it's error path so I guess not a tragedy even without squashing. > > > > > > I tend to not rebase once stuff has been in linux-next but I make > > > exceptions as long as it's before -rc4. For now I'v...

...ay Perl does it but with much less on-line commands, R "AFAIK" has n, c, Q and where and cann't debug outside the {}. 1) is there a more versatile/flexable debugging method for R? I have saved 2 functions in an ASCII file "digfun". "getdata" function calls "squash" function and both use loops. In another file.R I have source("digfun") debug(getdata) data <- getdata("c:/data/") Browse[1]> c Error in if (d[i, "V3"] == d[i + 1, "V3"] && d[i, "V4"] == d[i + 1, "V4"] && :...

...gmail.com> wrote: > > The LLVM incubator projects have been using github PRs for reviews and > so far haven't really seen any significant issues. The biggest confusion > so far has not been with reviews but with the difference between "rebase > and merge" and "squash and mere". We have used basically 3 different > processes: > > > > Method 1: start a review with one commit on a new branch (typically in a > personal repository 'fork'). Respond to review comments by adding > additional commits on the same branch. Then you want t...

...fault n > > > ---help--- > > > @@ -56,6 +62,7 @@ config VHOST_VSOCK > > > config VHOST_VDPA > > > tristate "Vhost driver for vDPA-based backend" > > > depends on EVENTFD > > > + select VHOST > > > This part is not squashed. > > > > > select VDPA > > > help > > > This kernel module can be loaded in host kernel to accelerate > > OK so I squashed this into the original buggy patch. > > Could you please play with vhost branch of my tree on various > > arch...

...fault n > > > ---help--- > > > @@ -56,6 +62,7 @@ config VHOST_VSOCK > > > config VHOST_VDPA > > > tristate "Vhost driver for vDPA-based backend" > > > depends on EVENTFD > > > + select VHOST > > > This part is not squashed. > > > > > select VDPA > > > help > > > This kernel module can be loaded in host kernel to accelerate > > OK so I squashed this into the original buggy patch. > > Could you please play with vhost branch of my tree on various > > arch...