Revision b2ec3615c81ca4f3c938245842a45956da8d5acb authored by Ammar Askar on 27 January 2018, 20:53:56 UTC, committed by Berker Peksag on 27 January 2018, 20:53:56 UTC
Travis when merging changes from a pull request onto the target branch does not perform a rebase, instead it does a simple merge which causes the PR commits to retain their commit dates. This means that the commit log can potentially look like: PR merge <-- HEAD normal master commit <- master more commits from normal workflow PR commit 1 another master commit PR commit 2 Performing a git diff from PR commit 2 to master will accidentally include files that should not be there. Closes python/core-workflow#14
1 parent b1a6ac4
File | Mode | Size |
---|---|---|
.github | ||
Doc | ||
Grammar | ||
Include | ||
Lib | ||
Mac | ||
Misc | ||
Modules | ||
Objects | ||
PC | ||
PCbuild | ||
Parser | ||
Programs | ||
Python | ||
Tools | ||
m4 | ||
.gitattributes | -rw-r--r-- | 772 bytes |
.gitignore | -rw-r--r-- | 1.5 KB |
.hgeol | -rw-r--r-- | 1.0 KB |
.hgignore | -rw-r--r-- | 1.3 KB |
.hgtags | -rw-r--r-- | 8.7 KB |
.travis.yml | -rw-r--r-- | 6.0 KB |
LICENSE | -rw-r--r-- | 12.5 KB |
Makefile.pre.in | -rw-r--r-- | 60.9 KB |
README.rst | -rw-r--r-- | 9.1 KB |
aclocal.m4 | -rw-r--r-- | 10.7 KB |
config.guess | -rwxr-xr-x | 43.2 KB |
config.sub | -rwxr-xr-x | 35.7 KB |
configure | -rwxr-xr-x | 480.1 KB |
configure.ac | -rw-r--r-- | 158.1 KB |
install-sh | -rwxr-xr-x | 7.0 KB |
pyconfig.h.in | -rw-r--r-- | 41.8 KB |
setup.py | -rw-r--r-- | 99.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...