Github user auonhaidar commented on the issue:
https://github.com/apache/incubator-madlib/pull/81
Hey NJ,
I think the rebase is not happening in the desired way. I first pulled the
changes from apache repo to my local master.
Output:
haidar@haidar-XPS-L501X:~/MADLIB-AUON/GIT/Madlib/incubator-madlib$ git log
--graph --decorate --oneline --all
* c069a42 (origin/features/knn) Merge pull request #1 from
orhankislal/features/knn
|\
| * d9fb5c0 KNN: Documentation updates
|/
* 9a01440 JIRA: MADLIB-927 Documentation Added
* 29969c2 License added:Assertions added
* 573edc4 changes in knn function of knn_sql.in:distance calculation
optimized:error messages
* 22db2e1 JIRA: MADLIB-927 Changes made in KNN-help message-test cases-etc
* b1a8d10 KNN Added
| * 0e00a27 (HEAD, origin/master, origin/HEAD, master) Include
boost::format in MathToolkit_impl.hpp.
| * f7cb980 Madpack: Add password into connection args
| * 29acc53 Documentation: Fix misc errors
| * faec6be Reverses the changes to the madlib.mode function to maintain
backwards compatibility
| * 13203ba Update dateformat in multiple install-checks
| * 9d04b7d Minor fixes
| * 8e5da2f Association Rules: Add rule counts and limit itemset size
feature
| * e384c1f RF: Fixes the online help and example
| * 498c559 Graph: SSSP
| * 02a7ef4 PCA: Add grouping support to PCA
| * e0439ed Madpack: Disable psqlrc when executing queries
| * c564e31 Build: Update madpack versioning to include _ and +
| * 3cf3f67 Build: Exclude AggCheckCallContext for GPDB5
| * e75a944 Elastic Net: Add CV examples, clean user docs
| * 6f12264 CV: Fix order of validation output table columns
| * e1f37bb Utilities: Fix incorrect flag for distribution
| * 02f4602 DT and RF: Adds verbose option for the dot output format.
| * c56b209 Build: Correct madlib version in gppkg spec file
| * e43b449 New module: Encode categorical variables
| * d2289b0 Fixes the kmeans_state related bug
| * 6021f67 Minor error message corrections
| * b045f7e Adds cluster variance to kmeans for PivotalR support.
| * 6939fd6 Elastic net: Add cross validation
| * 38d1e87 Fix post process for gppkg to link to hyphenated directories
|/
* 6138b00 Elastic Net: Add grouping support
* 21bec82 Build: Ensure gppkg version does not contain hyphen
* 82e56a4 Build: Fix version used in rpm installation
* 150459d Madpack: Disable unittest flag
* 39efdb9 Build: Fix madpack revision parsing
* ac1bcfa Assoc rules: Clean + elaborate documentation
I then checked out my features/knn branch and ran 'git rebase master' but
it showed:
git rebase master
First, rewinding head to replay your work on top of it...
Applying: KNN Added
Using index info to reconstruct a base tree...
M src/config/Modules.yml
<stdin>:135: space before tab in indent.
DROP TABLE IF EXISTS pg_temp.knn_label;
<stdin>:136: space before tab in indent.
CREATE TABLE pg_temp.knn_label(pid integer, predlabel float);
<stdin>:138: trailing whitespace.
<stdin>:142: trailing whitespace.
<stdin>:159: trailing whitespace.
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/config/Modules.yml
Applying: JIRA: MADLIB-927 Changes made in KNN-help message-test cases-etc
Applying: changes in knn function of knn_sql.in:distance calculation
optimized:error messages
Applying: License added:Assertions added
Applying: JIRA: MADLIB-927 Documentation Added
Applying: KNN: Documentation updates
And after that my repo looks like:
git log --graph --decorate --oneline --all
* 9cc0b0a (HEAD, features/knn) KNN: Documentation updates
* 8be68b9 JIRA: MADLIB-927 Documentation Added
* 35d976d License added:Assertions added
* 67b466f changes in knn function of knn_sql.in:distance calculation
optimized:error messages
* a718a1e JIRA: MADLIB-927 Changes made in KNN-help message-test cases-etc
* 6922da1 KNN Added
* 0e00a27 (origin/master, origin/HEAD, master) Include boost::format in
MathToolkit_impl.hpp.
* f7cb980 Madpack: Add password into connection args
* 29acc53 Documentation: Fix misc errors
* faec6be Reverses the changes to the madlib.mode function to maintain
backwards compatibility
* 13203ba Update dateformat in multiple install-checks
* 9d04b7d Minor fixes
* 8e5da2f Association Rules: Add rule counts and limit itemset size feature
* e384c1f RF: Fixes the online help and example
* 498c559 Graph: SSSP
* 02a7ef4 PCA: Add grouping support to PCA
* e0439ed Madpack: Disable psqlrc when executing queries
* c564e31 Build: Update madpack versioning to include _ and +
* 3cf3f67 Build: Exclude AggCheckCallContext for GPDB5
* e75a944 Elastic Net: Add CV examples, clean user docs
* 6f12264 CV: Fix order of validation output table columns
* e1f37bb Utilities: Fix incorrect flag for distribution
* 02f4602 DT and RF: Adds verbose option for the dot output format.
* c56b209 Build: Correct madlib version in gppkg spec file
* e43b449 New module: Encode categorical variables
* d2289b0 Fixes the kmeans_state related bug
* 6021f67 Minor error message corrections
* b045f7e Adds cluster variance to kmeans for PivotalR support.
* 6939fd6 Elastic net: Add cross validation
* 38d1e87 Fix post process for gppkg to link to hyphenated directories
| * c069a42 (origin/features/knn) Merge pull request #1 from
orhankislal/features/knn
| |\
| | * d9fb5c0 KNN: Documentation updates
| |/
| * 9a01440 JIRA: MADLIB-927 Documentation Added
| * 29969c2 License added:Assertions added
| * 573edc4 changes in knn function of knn_sql.in:distance calculation
optimized:error messages
| * 22db2e1 JIRA: MADLIB-927 Changes made in KNN-help message-test cases-etc
| * b1a8d10 KNN Added
|/
I guess features/knn changes get played twice.
Could you help?
Regards,
Auon
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
