Ajout des lignes de code ajoutées d'une branche plus ancienne à la version la plus récente

Question

J'ai une ancienne version d'un repo (renderdoc) (v 0.27) qui a été modifiée par Stephan Ritcher. Cependant, il a de nombreux bugs qui ont été corrigés par l'auteur original Baldurk dans la dernière version à partir de maintenant 0.33. La question est de savoir comment puis-je récupérer les correctifs ou les modifications de la version 0.27 et l'ajouter à la version 0.33 ou s'il est plus facile de récupérer les corrections de bogues de la version 0.33 et de les ajouter à la branche de Stephan?

mona@DESKTOP-37GGNHL MINGW64 /d/experiment/renderdoc ((c67e3e7b...)) 
$ git log 
commit c67e3e7b7a221780ff904c516e9861826939e511 
Author: Stephan Richter <stephan.richter@gris.tu-darmstadt.de> 
Date: Sun Nov 27 17:47:15 2016 -0800 

    updated submodule repository 

commit 7fff78c1a341e15e143a6007837414265cf124ee 
Author: Stephan Richter <stephan.richter@visinf.tu-darmstadt.de> 
Date: Thu Nov 24 11:30:38 2016 +0100 

    don't close renderdoc automatically 

commit 5b60cf6507ca179bb7891adc33b7702994c7aae8 
Author: Stephan Richter <stephan.richter@visinf.tu-darmstadt.de> 
Date: Wed Sep 7 15:47:03 2016 +0200 

    Added ID rendering mode for extracting mesh, texture, and shader IDs from G-                                                buffer pass. Added option to load and execute script right after log file is loa                                                ded. Replaced tinyexr with OpenEXR for dumping textures. 

commit eb3e74db38c29c2c7d74745ff7c85383d310f389 
Author: baldurk <baldurk@baldurk.org> 
Date: Wed Jan 20 20:19:53 2016 +0100 
:...skipping... 
commit c67e3e7b7a221780ff904c516e9861826939e511 
Author: Stephan Richter <stephan.richter@gris.tu-darmstadt.de> 
Date: Sun Nov 27 17:47:15 2016 -0800 

    updated submodule repository 

commit 7fff78c1a341e15e143a6007837414265cf124ee 
Author: Stephan Richter <stephan.richter@visinf.tu-darmstadt.de> 
Date: Thu Nov 24 11:30:38 2016 +0100 

    don't close renderdoc automatically 

commit 5b60cf6507ca179bb7891adc33b7702994c7aae8 
Author: Stephan Richter <stephan.richter@visinf.tu-darmstadt.de> 
Date: Wed Sep 7 15:47:03 2016 +0200 

    Added ID rendering mode for extracting mesh, texture, and shader IDs from G-                                                buffer pass. Added option to load and execute script right after log file is loa                                                ded. Replaced tinyexr with OpenEXR for dumping textures. 

commit eb3e74db38c29c2c7d74745ff7c85383d310f389 

En outre, comment puis-je sélectionner tous les correctifs de Stephan de manière interactive?

mona@DESKTOP-37GGNHL MINGW64 /d/experiment/renderdoc ((c67e3e7b...)) 
$ git reflog 
c67e3e7b HEAD@{0}: checkout: moving from playing_for_data to c67e3e7b7a221780ff904c516e9861826939e511 
c67e3e7b HEAD@{1}: clone: from https://bitbucket.org/visinf/projects-2016-playing-for-data-renderdoc 

et

mona@DESKTOP-37GGNHL MINGW64 /d/experiment/renderdoc ((c67e3e7b...)) 
$ git branch 
* (HEAD detached at c67e3e7b) 
    playing_for_data 

et

mona@DESKTOP-37GGNHL MINGW64 /d/experiment/renderdoc ((c67e3e7b...)) 
$ git status 
HEAD detached at c67e3e7b 
Changes not staged for commit: 
    (use "git add <file>..." to update what will be committed) 
    (use "git checkout -- <file>..." to discard changes in working directory) 

     modified: pdblocate/pdblocate.vcxproj 
     modified: renderdoc/3rdparty/breakpad/client/windows/common.vcxproj 
     modified: renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_client.vcxproj 
     modified: renderdoc/3rdparty/breakpad/client/windows/crash_generation/crash_generation_server.vcxproj 
     modified: renderdoc/3rdparty/breakpad/client/windows/handler/exception_handler.vcxproj 
     modified: renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj 
     modified: renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj 
     modified: renderdoc/driver/gl/renderdoc_gl.vcxproj 
     modified: renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj 
     modified: renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj 
     modified: renderdoc/renderdoc.vcxproj 
     modified: renderdoccmd/renderdoccmd.vcxproj 
     modified: renderdocshim/renderdocshim.vcxproj 
     modified: renderdocui/ironpython/compilelibs.sh 

Untracked files: 
    (use "git add <file>..." to include in what will be committed) 

     renderdoc.VC.VC.opendb 
     renderdoc.VC.db 
     renderdocui/ironpython/pythonlibs.zip 

no changes added to commit (use "git add" and/or "git commit -a") 

aussi:

mona@DESKTOP-37GGNHL MINGW64 /d/latest_renderdoc/renderdoc (master) 
$ git status 
On branch master 
Your branch is up-to-date with 'origin/master'. 
nothing to commit, working tree clean 

et certaines des choses de la dernière git log version:

$ git log 
commit 1ba4a8ad1efbc1ee6ac13649a59adb8420910a3e 
Author: baldurk <baldurk@baldurk.org> 
Date: Thu Feb 23 23:53:24 2017 +0000 

    Reapply fix 16f85cadc which was wrongly removed by 5a1ded738 

commit a029fc4ab1d6f24aba969d28b81d66f01931766f 
Author: Baldur Karlsson <baldurk@baldurk.org> 
Date: Thu Feb 23 17:46:42 2017 +0000 

    Update screenshots to point to renderdoc.org site 

commit 73ba1c140a4e02b147f4398cc3cd1fed6ecaa738 
Author: Janos Pantos <jp.uszeged@partner.samsung.com> 
Date: Thu Feb 23 18:21:34 2017 +0100 

    Fix eglCreateWindowSurface function name at dlsym call. 

commit 898e95496531b8cc10f8ddb513d362d15e3e0e68 
Author: baldurk <baldurk@baldurk.org> 
Date: Thu Feb 23 17:38:09 2017 +0000 

    Bump version info to v0.34 
:...skipping... 
commit 1ba4a8ad1efbc1ee6ac13649a59adb8420910a3e 
Author: baldurk <baldurk@baldurk.org> 
Date: Thu Feb 23 23:53:24 2017 +0000 

    Reapply fix 16f85cadc which was wrongly removed by 5a1ded738 

commit a029fc4ab1d6f24aba969d28b81d66f01931766f 
Author: Baldur Karlsson <baldurk@baldurk.org> 
Date: Thu Feb 23 17:46:42 2017 +0000 

    Update screenshots to point to renderdoc.org site 

Answer 1

Pour l'ancienne version v0.27 de /d/experiment/renderdoc, vous pouvez l'ajouter en tant que remote dans v0.33 /d/latest_renderdoc/renderdoc. Et vous pouvez ensuite rebasculer les modifications de v0.27 à v0.33. étapes détaillées comme suit:

git remote add old /d/experiment/renderdoc 
git fetch old 
git rebase --onto master <commit id on v0.27 before start to rebase) <commit if on v0.27 of the end to rebase> 
git checkout -b temp 
git checkout master 
git merge temp 

Tels que si vous voulez les commits rebasage 7fff78c1a341e15e143a6007837414265cf124ee-c67e3e7b7a221780ff904c516e9861826939e511 à v0.33 branche principale, vous devez utiliser git rebase --onto master 5b60cf6 c67e3e7. Parce que les validations que vous rebassez sur master n'existent pas dans votre origine, et après que vous les avez rebasées sur master, il n'y a pas de branche à pointer. Vous devez donc créer une branche pour pointer le commit après avoir terminé le rebase, puis avancer rapidement la branche master pour la pointer (comme les 3 dernières commandes ci-dessus).