summaryrefslogtreecommitdiffstats
path: root/webkit/tools/merge
Commit message (Collapse)AuthorAgeFilesLines
* Fixes CRLF and trailing white spaces.maruel@chromium.org2009-03-051-10/+10
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
* chrome side of the webkit mergetc@google.com2009-02-241-0/+2
| | | | | | | | | - Add platform specific chromiumclipboard files. - Some methods got renamed in renderlayer, so change some method names in our glue code. Review URL: http://codereview.chromium.org/27096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10286 0039d316-1c4b-4281-b951-d872f2087c98
* On Windows, find all modified files after a WebKit merge and force thempamg@google.com2009-02-122-3/+23
| | | | | | | | | | | | | | to LF. 'svn merge' saves them with CRLF otherwise, which interferes with later merges. Remove the now-obsolete code that did the same thing after a 3-way merge, which only took effect when a file had conflicts. BUG=7536 TEST=run a merge, see no CRLF in text files Review URL: http://codereview.chromium.org/20289 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9650 0039d316-1c4b-4281-b951-d872f2087c98
* Make merge script work with BeyondCompare on Vista64. BComp.exe is installeddarin@chromium.org2009-02-091-0/+2
| | | | | | | | | | under C:\Program Files (x86) instead. R=dglazkov Review URL: http://codereview.chromium.org/25001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9431 0039d316-1c4b-4281-b951-d872f2087c98
* Use Vars for the webkit repo and revision number. This wayojan@google.com2009-02-031-10/+4
| | | | | | | | | | we can override the via custom_vars in .gclient on the bots and official builds updates the merge script appropriately. Also updates checkdeps to be Var-aware. Review URL: http://codereview.chromium.org/19508 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9098 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 8969.ojan@google.com2009-01-301-4/+10
| | | | | | Review URL: http://codereview.chromium.org/19507 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8970 0039d316-1c4b-4281-b951-d872f2087c98
* Use Vars for the webkit repo and revision number. This wayojan@google.com2009-01-301-10/+4
| | | | | | | | | | | | | | we can override the via custom_vars in .gclient on the bots and official builds. Also pulls JavaScriptCore from webkit.org and updates the merge script appropriately. This is blocked on http://code.google.com/p/gclient/source/detail?r=41 being checked in an pushed. Review URL: http://codereview.chromium.org/19690 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8969 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the merge diff3 wrapper to work around a python subprocess bug on windowseseidel@chromium.org2009-01-271-5/+21
| | | | | | | TBR(ojan) Ojan wrote this with me and we tested it together Review URL: http://codereview.chromium.org/19023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8728 0039d316-1c4b-4281-b951-d872f2087c98
* fix the merge script to die on svn errors. Ojan reviewed.eseidel@chromium.org2009-01-271-4/+6
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8686 0039d316-1c4b-4281-b951-d872f2087c98
* Set the svn eol-style to LF for merge scripts.tc@google.com2009-01-231-109/+109
| | | | | | | TBR=pamg Review URL: http://codereview.chromium.org/18557 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8567 0039d316-1c4b-4281-b951-d872f2087c98
* Update the diff3 wrapper to use the checked intc@google.com2009-01-232-3/+3
| | | | | | | | | python and use windows paths rather than cygwin paths because the checked in python doesn't know about cygwin paths. Review URL: http://codereview.chromium.org/18680 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8539 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium part of WebKit merge 39880:39894brettw@chromium.org2009-01-141-0/+1
| | | | | | | This also adds a batch file for running the merge script since I don't have sh. Review URL: http://codereview.chromium.org/18061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8044 0039d316-1c4b-4281-b951-d872f2087c98
* Ensure that merged files use LF rather than CRLF. This will hopefully keep thepamg@google.com2009-01-131-2/+8
| | | | | | | | | | | | | CRLFs out of our repository, so the Mac andLinux tryservers can apply patches to the files successfully. BUG=6117 TEST=run a WebKit merge using BeyondCompare, and another using kdiff3. Make sure no CRLFs appear in the files checked in. Review URL: http://codereview.chromium.org/17387 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7949 0039d316-1c4b-4281-b951-d872f2087c98
* Add a .bat script wrapper for the Python diff3 wrapper so it can be calledpamg@google.com2008-12-182-24/+40
| | | | | | | | | | | successfully from svn in Cygwin. (Some people were able to use the .py wrapper directly, but I can't. I suspect it has to do with file mappings in Windows.) Change merge.py to use the .bat script, add an --svn option to specify the path to the right svn executable, and strip trailing whitespace. Review URL: http://codereview.chromium.org/14830 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7241 0039d316-1c4b-4281-b951-d872f2087c98
* Apply svn:executable to .py files which should have it.phajdan.jr@chromium.org2008-12-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/14012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6884 0039d316-1c4b-4281-b951-d872f2087c98
* Have merge script update DEPS and gclient sync correctly.ojan@google.com2008-12-032-18/+34
| | | | | | Review URL: http://codereview.chromium.org/12924 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6326 0039d316-1c4b-4281-b951-d872f2087c98
* Add a wrapper around beyondcompare/kdiff3 so that it can be plugged intoojan@google.com2008-12-022-9/+127
| | | | | | | | | svn merge's diff3-cmd. Eventually, others can use this for other diff3 tools as well, they'll just need to add the right tweaks to support other tools. Review URL: http://codereview.chromium.org/11520 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6192 0039d316-1c4b-4281-b951-d872f2087c98
* Update deps and the merge tool now that WebKit and WebKitLibraries have been ↵ojan@google.com2008-11-221-2/+0
| | | | | | | | deleted. Review URL: http://codereview.chromium.org/11370 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5878 0039d316-1c4b-4281-b951-d872f2087c98
* Script to do webkit merges!ojan@google.com2008-11-142-0/+171
| | | | | | Review URL: http://codereview.chromium.org/10672 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5426 0039d316-1c4b-4281-b951-d872f2087c98
* Use a more compact license header in source files.license.bot2008-08-241-28/+4
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1287 0039d316-1c4b-4281-b951-d872f2087c98
* Add webkit to the repository.initial.commit2008-07-272-0/+872
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-01 13:45:07 +0000