On Mon, 16 Jun 2014, Jed Brown wrote: > "Vijay S. Mahadevan" <[email protected]> writes: > > Barry, I like this capability of tracking different dependency branch > > based on the current feature branch > > Tracking branches from external repositories makes it impossible to > reproduce a prior state (to reproduce a broken or working state, perhaps > by bisection).
Perhaps something like the following is better [for ABI changes]? (wrt dmmoab-feature-1 tracks v4.6.1 and dmmoab-feature-2 tracks v4.6) dmmoab-feature-1 tracks v4.6.1 should have 2 parts (using 2 different branches): 1. dmmoab-update-v4.6.1: update dmmoab code in petsc to v4.6.1 2. dmmoab-new-feature-1: (using v4.6.1) dmmoab-new-feature-1 should start after dmmoab-update-v4.6.1 (thats the original assumption anyway) git checkout dmmoab-update-v4.6.1 git checout -b dmmoab-new-feature-1 <edit> commit dmmoab-feature-2 (tracks v4.6): perhaps this was started from petsc master (corresponding to v4.6) This could be rebased over dmmoab-update-v4.6.1. (merging dmmoab-update-v4.6.1 and fixing api changes should also work) Satish
