git-svn: preserving merges across two different git-svn repos -


we have been using workflow @ work several months svn developers create svn fix branches merged integration branch using git , committed svn, merge @ time, dcommit. in workflow, there has been single git-svn repo doing merge work.

this workflow has worked pretty , git merges faithfully preserved in original git-svn repo.

however, have decided spread merging workload across number of users, each of has own git-svn repo. unfortunately, finding merges performed 1 git-svn user (but not always) appear single parent commits in git-svn repo of other user instead of looking 2 parent merges.

loss of merge history plays havoc history analysis , causes unnecessary merge conflicts since git can no longer identify correct merge-base, if merges parents had been preserved across repositories.

does have practices avoid circumstances cause merge history corrupted in 1 or more git-svn repos sync common svn repo?

i not sure causes problem, have found acceptable workaround recreate merges in git use of grafts per technique described here:

fixing svn merge history in git repositories

although haven't bothered filter branch yet not convinced plays nice svn rev maps git-svn uses track mapping between svn , git commits.


Comments

Post a Comment

Popular posts from this blog

linux - xterm copying to CLIPBOARD using copy-selection causes automatic updating of CLIPBOARD upon mouse selection -

i've tried various ways coerce xterm (versions 285 , 292) copy selection clipboard clipboard whenever press ctrl-shift-c. promising way far has been, in ~/.xresources, put this: xterm*vt100.translations: #override \ ctrl shift <keypress> c: copy-selection(clipboard) \n\ ctrl shift <keypress> v: insert-selection(clipboard) ctrl-shift-v works perfectly, copying has nuance... if restart xterm, highlighting text puts things in primary clipboard; expected, proper, default behavior. if hit ctrl-shift-c, copies current selection clipboard clipboard. the bug, however, if highlight text after first time pressed ctrl-shift-c, you'll see highlighting copies both primary and clipboard. cannot figure out how stop xterm updating clipboard upon selection... , doesn't make sense me in first place. i said, @ specific point in time, copy selection clipboard... yet starts updating automatically upon selection after doing once... anyone have workaround...
Read more

qt - Errors in generated MOC files for QT5 from cmake -

i generated moc files qt5 using set (cmake_automoc on) set(cmake_include_current_dir on) then add moc files src using set(src src/main.cpp src/video_widget_surface.cpp src/video_widget.cpp src/video_player.cpp #moc files moc/moc_video_player.cpp moc/moc_video_widget.cpp moc/moc_video_widget_surface.cpp finally add executable using add_executable(somegui ${src}) but errors in moc files saying : /other/workspace/perception/somestuff/moc/moc_video_widget.cpp:54:6: error: 'videowidget' has not been declared /other/workspace/perception/somestuff/moc/moc_video_widget.cpp:62:19: error: 'videowidget' has not been declared /other/workspace/perception/somestuff/moc/moc_video_widget.cpp:68:20: error: 'videowidget' has not been declared /other/workspace/perception/somestuff/moc/moc_video_widget.cpp:68:46: error: non-member function 'const qmetaobject* metaobject()' cannot have cv-qualifier /other/qt5.0.1/5.0.1/gcc_64/include/qtcore/qo...
Read more