Re: [Condor-devel] GIT branch surgery

[Nathan Panike <nwp@xxxxxxxxxxx>]

On Mon, Aug 22, 2011 at 02:36:45PM -0500, Greg Thain wrote:
> 
> There was a problem where the master was merged into the V7.7.1
> branch.  With Nathan's good help the branch is now fixed, but anyone
> with the branch checked out will need to remove and re-fetch it.
> 
> We thank you for your support.
> 
> -Greg
> 
> _______________________________________________
> Condor-devel mailing list
> Condor-devel@xxxxxxxxxxx
> https://lists.cs.wisc.edu/mailman/listinfo/condor-devel

Wow, this is a mess:  

git tag --contains BUILD-trunk-2011-8-10 returns
BUILD-V7_7_1-branch-2011-8-18
BUILD-V7_7_1-branch-2011-8-19
BUILD-V7_7_1-branch-2011-8-20
BUILD-V7_7_1-branch-2011-8-21
BUILD-trunk-2011-8-10
BUILD-trunk-2011-8-11
BUILD-trunk-2011-8-12
BUILD-trunk-2011-8-13
BUILD-trunk-2011-8-14
BUILD-trunk-2011-8-15
BUILD-trunk-2011-8-16
BUILD-trunk-2011-8-17
BUILD-trunk-2011-8-18
BUILD-trunk-2011-8-19
BUILD-trunk-2011-8-20
BUILD-trunk-2011-8-21

So evidently, master got merged into V7_7_1-branch sometime on 8/17 (Last Wed)

I intend to rewind 7.7.1 back to BUILD-V7_7_1-branch-2011-8-17 and rebuild by
cherry-picking, then merging with V7_6-branch, but I need some help to decide
whether the commits below belong on 7.7.1 or master:

Please reply and indicate whether a commit below should be cherry-picked onto 7.7.1:

Greg Thain 1273280 Sched holds onto claims if asked to #2094
Cathrin Weiss 913b248 Adjust SCHEDD_ASSUME_NEGOTIATOR_GONE default according to changes made in 7.7.1 (#2336)
Greg Thain f386ae8 Remove test prereqs on fedora_14 SubmitInfo.pm for new batlab
John (TJ) Knoeller fd2fc36 fixes for DC statistics #2354 so that the code builds in linux. also fix some indenting in condor_daemon_core.h. ===VersionHistory:None===
John (TJ) Knoeller f88ad97 Add statistics for the main loop of DaemonCore ===GT=== #2354 ===VersionHistory:Pending===
Alan De Smet 2a8fd0e Document Ticket #2382: command.cpp accept_request_claim uses uninitialized variable ===GT=== #2382
Alan De Smet c90a3f8 Fix compiler warning and errant D_FULLDEBUG warning. Also fixes in some circumstances a startd may set a null ClientMachine in its ClassAd. ===GT=== #2382 ===GT:Fixed=== #2382
John (TJ) Knoeller 90298a6 Remove version from OpSys attribute, and add OpSysVer attribute. also added OpSys_And_Ver attribute for legacy value of OpSys and new param ENABLE_VERSIONED_OPSYS to control the new behavior of OpSys with a default value of false on Windows and true on unix. ===GT=== #2366 ===Doc=== Pending
John (TJ) Knoeller 66350f2 move version history for statistics (#2197) from 7.7.1 section to 7.7.2 where it belongs. ===VersionHistory=== none
John (TJ) Knoeller caa6de9 added preliminary version history for schedd statistics. ===GT=== #2197 ===Doc=== Pending
Karen Miller 1439982 edit of new 7.7.2 version history item.
Dan Bradley a74b0ea Documented improvement of error reporting in safe_switch_to_uid(). #2364
Dan Bradley 489ed67 Improved error reporting in safe_switch_to_uid(). #2364
Scot Kronenfeld b8fc6c1 Added Ruby as a dependency on two more platforms that need it for testing deltacloud
Scot Kronenfeld f444b86 Added ruby as a dependency for some platforms that we cross-test on to make the deltacloud tests work.
Karen Miller 94306ab edit of new 7.7.2 version history items (spelling, grammar, formatting, content)
Todd Tannenbaum 0deafae Corrected formatting of Manual Version History entries.
Alan De Smet 04b7e09 Document Ticket #2375: condor_config.generic now contains COLLECTOR_ADDRESS_FILE
Alan De Smet 722c74a Setting COLLECTOR_ADDRESS_FILE by default; useful for personal Condors and glideins.
Timothy St. Clair 1997ede Ticket #1613 - Update to unparse to lookup in add prior to PrettyPrint
Matthew Farrellee 3767258 Added 7.7.2 version history for NONDURABLE and Scheduler attribute expectation mismatch, see #2367
Karen Miller a6d13fb merge brought in unwanted change.  Corrected.
Jaime Frey ef19903 Update ClassAds version to 7.7.2.
Matthew Farrellee 673a88e Made DedicatedScheduler's SetAttributeString of ATTR_SCHEDULER to be NONDURABLE, #2367
Matthew Farrellee b796ae6 Reconciled qmgmt's correct_scheduler with dedicated_scheduler's ds_name, #2367
Timothy St. Clair 39eaab3 Ticket #2060 add preen output to dprintf logs.
Greg Thain d854a66 Add 7.7.2 version history section
Greg Thain 81f3a37 Add 7.7.2 empty section
Greg Thain 6ea0b6e Bump version in docs to 7.7.2
Greg Thain 8813043 Update version string to 7.7.2

Nathan Panike