Bug 838549 - Integration-Branch.patch contains conflict markers
Integration-Branch.patch contains conflict markers
Product: Red Hat Enterprise MRG
Classification: Red Hat
Component: condor (Show other bugs)
Unspecified Unspecified
unspecified Severity unspecified
: ---
: ---
Assigned To: grid-maint-list
MRG Quality Engineering
Depends On:
  Show dependency treegraph
Reported: 2012-07-09 08:45 EDT by Florian Weimer
Modified: 2012-07-10 10:00 EDT (History)
2 users (show)

See Also:
Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of:
Last Closed: 2012-07-10 10:00:38 EDT
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
Verified Versions:
Category: ---
oVirt Team: ---
RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: ---

Attachments (Terms of Use)

  None (edit)
Description Florian Weimer 2012-07-09 08:45:41 EDT
The Integration-Branch.patch file patches files with conflict markers (as of version 7.6.5-0.17):

+<<<<<<< HEAD
+  \item \verb@DAEMON_LIST@
+>>>>>>> origin/UPSTREAM-7.7.0-BZ713511-POST-dag-script
   \item \verb@FetchWorkDelay@
   \item \verb@MAX_NUM_CPUS@
   \item \verb@MAX_TRACKING_GID@
@@ -437,6 +441,10 @@ the changed value.
   \item \verb@CKPT_SERVER@
   \item \verb@COLLECTOR@
   \item \verb@DBMSD@
+<<<<<<< HEAD
+  \item \verb@EC2_GAHP@
+>>>>>>> origin/UPSTREAM-7.7.0-BZ713511-POST-dag-script

They appear to have been introduce in 7.6.5-0.13.

This could be benign, but I think it's worth cleaning this up.
Comment 1 Timothy St. Clair 2012-07-10 10:00:38 EDT
It is benign, these are markers in the main documentation which is not used in our packages.   I purposefully did not fix b/c it is a zero sum gain.

Note You need to log in before you can comment on or make changes to this bug.