On Sun, Nov 15, 2015 at 06:22:01PM -0500, Fernand Veilleux wrote:
> ...
> I made some changes and tried pushing to linuxcnc.git
>
> I had some problems because I was not aware I had to make a pull before
> When I saw it would not work I continued editing and made more changes.
>
> Files changed
>
> lib/python/gladevcp/features.py
> share/features/features.glade
> share/features/catalogs/mill/defaults.ngc
> configs/sim/gmoccapy/features_demo/gmoccapy.ini
I updated my git tree to look at features_preview branch and i
see your patch and merge are listed:
$ git log --graph --oneline -5
* fc7e8f7 Merge branch 'features_preview' of
ssh://git.linuxcnc.org/git/linuxcnc into features_preview
|\
| * 0b34908 features_preview: relocate placeholders, +cleanups
* | cac0ffd features_preview: relocate placeholders, +cleanups
|/
* f10be13 features_preview: dialog for system file updates
* 481758e features_preview: sim configs firsttime startup
I'm not sure what is going on:
cac0ffd is my (dgarr) last commit
0b34908 has same commit message as cac0ffd but doesn't seem to have
the modifications you are making
So it doesn't look like your (FernV) changes for the 4 files mentioned above
got into the commit 0b34908.
For example, i update the features_preview branch
then cd to the toplevel git directory and look at
the log for the file lib/python/gladevcp/features.py,
i get:
$ git log --reverse --pretty=format:"%h %ai %s" lib/python/gladevcp/features.py
b8ce341 2015-10-28 04:27:36 -0700 bringin_features: adapt to LinuxCNC git tree
976012a 2015-10-29 15:25:04 -0700 features_preview: update to fernv repo
9b7f179 2015-10-31 04:32:07 -0700 features_preview: update 'features' in git
tree
f10be13 2015-11-04 11:02:08 -0700 features_preview: dialog for system file
updates
cac0ffd 2015-11-05 09:18:38 -0700 features_preview: relocate placeholders,
+cleanups
So your changes are not there.
We probably need Seb's help.
As a suggestion, before pushing you could try the following:
1) $ git add the_files_you_update
2) $ git commit -s -m "message_for_the_update"
3) $ git format-patch -1
The last command 3) will create a patch file that you can examine
to see if your changes are in the patch.
--
Dewey Garrett
------------------------------------------------------------------------------
Presto, an open source distributed SQL query engine for big data, initially
developed by Facebook, enables you to easily query your data on Hadoop in a
more interactive manner. Teradata is also now providing full enterprise
support for Presto. Download a free open source copy now.
http://pubads.g.doubleclick.net/gampad/clk?id=250295911&iu=/4140
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
