Changes between Version 2 and Version 3 of PostCvtMergePoint


Ignore:
Timestamp:
Dec 28, 2013, 4:13:57 PM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • PostCvtMergePoint

    v2 v3  
    1111== Preparation ==
    1212
    13 Peter Dimov suggested the following in response to problems Beman Dawes ran into with the merge point establishment:
     13Peter Dimov suggested the following in response to problems encountered by others:
    1414
    1515To avoid unpleasant surprises, what I did was ensure that {{{develop}}} and {{{master}}} are identical before doing the first merge.
    1616
    1717{{{
    18 cd modular-boost/libs/
     18cd modular-boost/libs/<my-library.
    1919git diff --name-status master..develop
    2020}}}
    … …  
    2424(In principle, we all have kept our trunk and release branches in sync, so the above ought to have yielded nothing. In practice, however, all libraries likely had differences because (1) we sometimes forget to merge, (2) sometimes other people changed trunk and didn't merge and we didn't know, and (3) Stephen Kelly's Boost-wide changes were only on trunk.)
    2525
    26 I then proceeded to identify the commits causing each change. I don't remember how exactly I did that, probably by using {{{git log}}} on the modified files and by looking at the commit history on Github.
     26I then proceeded to identify the commits causing each change. I don't remember how exactly I did that, probably by using {{{git log}}} on the modified files and by looking at the commit history on !Github.
    2727
    2828After that, I applied each missing commit using {{{git cherry-pick <sha>}}}. That is, if a commit on {{{develop}}} was not present on {{{master}}}, I applied it to {{{master}}} with {{{git cherry-pick}}}; and if a commit on {{{master}}} was missing on {{{develop}}} (things like that do happen occasionally), I applied it on {{{develop}}}. I tried to do this in chronological order, which minimizes conflicts.
    … …  
    5151}}}
    5252
    53 '''Caution:''' Check any changed files carefully, particularly if you thought {{{master}}} was up-to-date. You can use {{{git status}}} and {{{git diff}}} to check for modifications. In the example case there are none. If all is as expected, make the commit and push to !GitHub:
     53'''Caution:''' Check any changed files carefully, particularly if you thought {{{master}}} was up-to-date. You can use {{{git status}}} and {{{git diff master..develop}}} to check for modifications. In the example case there are none. If all is as expected, make the commit and push to !GitHub:
    5454
    5555{{{
    … …  
    6060Then navigate to your libraries history again, and check that the merge shows up, [https://github.com/boostorg/config/commits/master our config example is here].
    6161You're now ready for "routine" merges to proceed as per Git Flow (or whatever other strategy you wish to use).
     62
     63-----