[Condor-devel] Git wisdom on V7_4-branch changes, merging to master

[Trevor McKay <tmckay@xxxxxxxxxx>]

Hello,

  I went to commit a fix against V7_4 for GT #1745,
https://condor-wiki.cs.wisc.edu/index.cgi/tktview?tn=1745

  I followed instructions from git wisdom and made a local branch that
tracked the remote, committed the patch, and merged to the master branch
on advice of the wiki.

  Resolved a merge conflict and completed the merge.  But, the resultant
set of changes includes more than just my commit.  In particular, there
is quite a large merge by Karen Miller

"Merge branch 'V7_4-branch' of /p/condor/repository/CONDOR_SRC into
V7_4-branch" 

( the link for this commit is
https://condor-wiki.cs.wisc.edu/index.cgi/chngview?cn=19621)

  Now, do I push to master or not?  I don't want to merge in a bunch of
stuff that doesn't belong there.  Going forward, if we have bug fixes
against V7_4 that are appropriate for master, should we skip the step of
merging to master as the wiki indicates and simply apply the patch to
master directly as another operation?  Or something else?

  How to proceed?  My git experience is limited.

Thanks,

Trevor McKay

--------------------------
Commands and output follow:
--------------------------


$ git branch V7_4-branch origin/V7_4-branch
$ git checkout V7_4-branch

# Apply patch and commit.  Then merge to master

$ git checkout master
$ git merge V7_4-branch
CONFLICT (delete/modify): src/Imakefile deleted in HEAD and modified in
V7_4-branch. Version V7_4-branch of src/Imakefile left in tree.
Automatic merge failed; fix conflicts and then commit the result.

# Uh oh.  src/Imakefile no longer exists in master branch.  Ok

$ git rm src/Imakefile
src/Imakefile: needs merge
rm 'src/Imakefile'

$ git status
# On branch master
# Changes to be committed:
#
#	modified:   src/condor_tools/wait.cpp
#

# Okay, yay.  Commit

$ git commit -a --author="Jon Thomas <jthomas@xxxxxxxxxx>"
[master a9909f3] Merge branch 'V7_4-branch'
 Author: Jon Thomas <jthomas@xxxxxxxxxx>

# One more check....but now what?

$ git log master --not --remotes=*/master
commit a9909f35ae0de43dbd8269e93d12cf06f0692ba4
Merge: eacd421 6324452
Author: Jon Thomas <jthomas@xxxxxxxxxx>
Date:   Fri Dec 10 14:21:10 2010 -0500

    Merge branch 'V7_4-branch'
    
    Conflicts:
        src/Imakefile

commit 632445295fad68886f137f306418a41c2def97a6
Author: Jon Thomas <jthomas@xxxxxxxxxx>
Date:   Fri Dec 10 14:13:48 2010 -0500

    Change condor_wait to open log files with read access instead of
readwrite (#1745)

commit 8935edcf622a0397660f4605f54a0afcb3fc5106
Merge: a216844 0e982c4
Author: Karen Miller <smoler@xxxxxxxxxxx>
Date:   Thu Dec 9 14:35:30 2010 -0600

    Merge branch 'V7_4-branch' of /p/condor/repository/CONDOR_SRC into
V7_4-branch

commit a21684415936b493238d347a0a57a858c66bf8a8
Author: Karen Miller <smoler@xxxxxxxxxxx>
Date:   Thu Dec 9 14:32:41 2010 -0600

    added missing manual pages; gittrac #1798