search

microsoft / opencv

Open Source Computer Vision Library
opencv.org
Apache License 2.0
144 stars 92 forks source link

syncing #66

Open stjong opened 9 years ago

stjong commented 9 years ago

@mkostin

Hi Max, in case you can help. I forked the msopentech\opencv in June. I found couple of commits by you from back in April in the forked repo that don't show up in the msopentech\opencv. Since I forked in June I'd expect the commits are in the upstream.

I'm curious if you'd have some thoughts how this might happen. Thanks!

https://github.com/stjong/opencv/commit/b56f591dda12925bba4b8ff0ce41f04802640af7 https://github.com/stjong/opencv/commit/be777684a33a732e0a4e4c2b9840a2a0fcb3f6f4

mkostin commented 9 years ago

@stjong some time ago OCV refactored highgui module and extracted video logic into videoio module, thus WinRT related logic has been refactored as well. Use master (Itseez or Microsoft) branch as a reference point, it contains all the latest bits.

stjong commented 9 years ago

@mkostin, thanks for the info, it's good to know as we learn more about the implementation.

Perhaps this is more of a question about git as we are pulling our changes in stjong to Microsoft. After doing a sync (pull from Microsoft to stjong), I still see the files from the 2 commits in the the forked repo (stjong). Do you remember if the two commits were reverted in Microsoft? But if so, the forked repository pulling all the changes in from Microsoft should see that and be in sync'ed (i.e. I shouldn't be seeing left over files).

Let me know if something is obvious.. Thanks Max!