Re: [Condor-devel] how to merge manual

[Nathan Panike <nwp@xxxxxxxxxxx>]

On Tue, Aug 02, 2011 at 09:49:39AM -0500, Karen Miller wrote:
> Perhaps I can clarify Dan's question, as you didn't give an
> answer to the question he was asking. . .
> 
> The question was:  how do you only merge only doc changes
> into the doc branch?
> Try this for his question:
>   How do you only merge the changes within the doc/ directory
> into the special doc branch?
> 
> Example:  assume branches of master, V7_7_0-branch (after
> release), V7_6-branch, V7_6_2-branch
> 
> Now, a bit into the future, src changes go into V7_6-branch
> intended for 7.6.3.  And, doc changes go into V7_6_2-branch.
> Merge path is

>   V7_6_2-branch into V7_6-branch (doc-only changes whether we
>      do or do not create a V7_6_2-doc-branch

OK --- merge as normal

>   V7_6-branch into V7_7_0-branch (or special V7_7_0-doc-branch)
>      This is the point in which src changes end up in the merge,
>      potentially causing conflicts.  UNLESS all developers also
>      use this same merge path.  Any conflict resolution I
>      choose then ends up being wrong for the last merge of

These changes should not go into the special V7_7_0-doc-branch, as the changes
are not pertinent to 7.7.0---can we expect at least a little sentience in the
developers?  See my reply to Dan Bradley, in which I wrote:

"... this is poor discipline.  If it is a src + doc change to V7_6-branch, where
the documentation is describing the change in src, there is no need to put the
documentation change in [V7_7_0-branch], as the corresponding src change will
not be going into 7.7.0, which is frozen.  On the other hand, if it is a src
change, and a doc change where the developer is saying `Well, I need to do
documentation', and slapping it in a commit with irrelevant src changes, it
should really be a reviewer that says, `These changes do not go together. why
don't you split them up, and put the doc change on [V7_7_0-branch], where it
belongs'"

If doc changes *must* go into V7_7_0-branch and you don't want the src changes,
you can do the following---admittedly yucky---recipe using git plumbing
commands (in bash syntax):

git checkout V7_7_0-branch
git read-tree --prefix=doc/ V7_6-branch:doc/
git checkout-index -a -f
git reset --hard $(git commit-tree $(git write-tree) -p $(git rev-parse HEAD) \
-p $(git rev-parse V7_6-branch))
<type a commit message, hit Ctrl-D when done>

>   V7_7_0-branch into master
> 

OK --- merge as normal.

> Clarify or not?
> Karen
> _______________________________________________
> Condor-devel mailing list
> Condor-devel@xxxxxxxxxxx
> https://lists.cs.wisc.edu/mailman/listinfo/condor-devel