Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 53114: Revert the merge info from these files because everytime... (Closed)

Created:
11 years, 9 months ago by Nicolas Sylvain
Modified:
9 years, 7 months ago
Reviewers:
M-A Ruel
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Revert the merge info from these files because everytime you do "svn merge -c -XXX ." they get modified. NO CODE CHANGE Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=12594

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+-59 lines, --59 lines) Patch
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/copy-standalone-image-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/testcase-9507-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/documenturi-assigned-junk-implies-relative-urls-do-not-resolve-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/getElementsByClassName/011-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/plugin-attributes-enumeration-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/tabindex-clamp-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/drag-in-frames-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/mouse-click-events-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/mouseup-from-button2-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/box-shadow-override-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-restrict-line-height-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/drag-out-of-textarea-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/onselect-textarea-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-no-scroll-on-blur-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textarea-scrolled-endline-caret-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/function-toString-parentheses-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/xmlhttprequest-missing-file-exception-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/external-entities-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/continuation-after-outline-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/table-percent-height-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/floating-th-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/table-display-types-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/table-display-types-strict-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/line-breaks-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/xsl/mozilla-tests-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/window-dot-stop-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-window-open-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-javascript-url-window-open-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-from-data-url-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-window-open-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-window-open-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/mouse-events-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/plugin-javascript-access-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/batik/text/textProperties-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/tabgroup-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/window-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/altglyph-expected.checksum View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/altglyph-expected.png View Binary file 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/altglyph-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-marker-and-object-creation-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/js-late-marker-creation-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/text/text-text-03-b-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/LayoutTests/xsl/transform-xhr-doc-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/pending/fast/repaint/bugzilla-6473-expected.checksum View 0 chunks +-1 lines, --1 lines 0 comments Download
M webkit/data/layout_tests/platform/chromium-win/pending/fast/repaint/bugzilla-6473-expected.png View Binary file 0 comments Download

Messages

Total messages: 2 (0 generated)
Nicolas Sylvain
11 years, 9 months ago (2009-03-26 20:31:32 UTC) #1
M-A Ruel
11 years, 9 months ago (2009-03-26 20:37:07 UTC) #2 
add NO CODE CHANGE to the description.

yay.

Powered by Google App Engine
This is Rietveld 408576698