Bug 34885 - Conflicting code on webqa
Conflicting code on webqa
Product: Red Hat Web Site
Classification: Red Hat
Component: Global Header (Show other bugs)
i386 Linux
medium Severity medium
: ---
: ---
Assigned To: Evalynna Ho
Depends On:
  Show dependency treegraph
Reported: 2001-04-05 10:51 EDT by Jay Turner
Modified: 2015-01-07 18:44 EST (History)
3 users (show)

See Also:
Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of:
Last Closed: 2001-04-05 19:24:14 EDT
Type: ---
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 Jay Turner 2001-04-05 10:51:14 EDT
Go to http://www.webqa.redhat.com/training/rhce/courses/, then click on the
RH300 link.  Will get really interesting page where it appears that another
page is absorbed into a frame on the current page and you end up with 2
global headers.

Now, the interesting thing is that in the middle of the page is a CVS
conflict indicator, so someone committed code and pushed it to webqa with a
conflict in it.
Comment 1 Lisa Palma 2001-04-05 19:24:10 EDT
I fixed the conflict issue - but I didn't think that CVS was supposed to accept
a commit of a file with a conflict in the first place. (?)
Comment 2 Jay Turner 2001-04-06 08:44:33 EDT
OK, fixed on webqa.  I don't think that CVS accepted a commit with a conflict, I
think that someone 'cvs up'd and did not resolve the resulting conflict, thus
leaving hte conflict indicators in the code on webqa.
Comment 3 Lisa Palma 2001-04-06 11:52:05 EDT
I wondered if that were the case or not, so before I set about "fixing" it, I
deleted the file completely from my sandbox, then I did a cvs update to get the
current version... the conflict was there.

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