Bug 57646 - add some directories to .gitignore (and svn:ignore) when opening projects in xcode4
Summary: add some directories to .gitignore (and svn:ignore) when opening projects in ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P5 Enhancement
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-01 11:16 PDT by Jon Lee
Modified: 2011-04-04 10:47 PDT (History)
4 users (show)

See Also:


Attachments
Patch (585 bytes, patch)
2011-04-01 11:16 PDT, Jon Lee
darin: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff
Patch (1.33 KB, patch)
2011-04-04 09:58 PDT, Jon Lee
eric: review+
eric: commit-queue-
Details | Formatted Diff | Diff
Patch (1.35 KB, patch)
2011-04-04 10:15 PDT, Jon Lee
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jon Lee 2011-04-01 11:16:39 PDT
Created attachment 87883 [details]
Patch

when opening the .xcodeproj's in xcode 4 new directories are added that can be safely ignored:

project.xcworkspace
xcuserdata

we should add these to the .gitignore file.  there was some concern that we might not be able to add them to svn:ignore, and given my own inexperience with svn i might need some help with that.
Comment 1 Darin Adler 2011-04-01 12:01:00 PDT
(In reply to comment #0)
> there was some concern that we might not be able to add them to svn:ignore

Worded in passive voice like that I can’t figure out who to talk to.

I see no reason not to add them to svn:ignore.
Comment 2 WebKit Commit Bot 2011-04-01 14:05:48 PDT
Comment on attachment 87883 [details]
Patch

Rejecting attachment 87883 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'land-a..." exit_code: 2

Last 500 characters of output:
e320df0bc2a7392c23fed272541949383a6debe (refs/remotes/trunk)
	M	Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
r82714 = 65aa910d1095f0da99aeef9066a4c23538920523 (refs/remotes/trunk)
	M	Source/WebCore/ChangeLog
	M	Source/WebCore/platform/graphics/ImageBuffer.h
	M	Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
r82715 = 59e1fa091b3ee61a947f76347ef0d8a9e046f29b (refs/remotes/trunk)
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/trunk.

Full output: http://queues.webkit.org/results/8319269
Comment 3 WebKit Commit Bot 2011-04-01 15:08:38 PDT
Comment on attachment 87883 [details]
Patch

Rejecting attachment 87883 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 2

Last 500 characters of output:
nderTree.xcodeproj/project.pbxproj
	M	Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
	A	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/mac/ConvertPoint.cpp
	M	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
	M	Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h
	M	Tools/ChangeLog
r82723 = 820aceeac648b5c1c776d8e5a1c747c4b9afd65f (refs/remotes/trunk)
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/trunk.

Full output: http://queues.webkit.org/results/8318307
Comment 4 Eric Seidel (no email) 2011-04-01 21:14:27 PDT
Found no modified ChangeLogs, cannot create a commit message.
All changes require a ChangeLog.  See:
 http://webkit.org/coding/contributing.html

It's failing a precommit step.  Sorry the output is confusing.
Comment 5 Jon Lee 2011-04-04 09:58:54 PDT
Created attachment 88071 [details]
Patch

Adding missing ChangeLog file.
Comment 6 WebKit Review Bot 2011-04-04 10:01:22 PDT
Attachment 88071 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style']" exit_code: 1

ChangeLog:1:  ChangeLog entry has no bug number  [changelog/bugnumber] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 7 Eric Seidel (no email) 2011-04-04 10:02:56 PDT
Comment on attachment 88071 [details]
Patch

Go go magic xcode 4.  I don't think that svn-apply can handle svn:ignore changes.

the stylebot doens't like that your'e missing the bug url:
https://bugs.webkit.org/show_bug.cgi?id=57646

prepare-changelog -b number
will automatically add it when you create the bug.  webkit-patch upload will too.

Thanks for hte patch!
Comment 8 Jon Lee 2011-04-04 10:15:46 PDT
Created attachment 88074 [details]
Patch

Fixed ChangeLog, and double checked that it passed webkit style.
Comment 9 Eric Seidel (no email) 2011-04-04 10:17:25 PDT
Comment on attachment 88074 [details]
Patch

Woohoo!
Comment 10 WebKit Commit Bot 2011-04-04 10:47:22 PDT
Comment on attachment 88074 [details]
Patch

Clearing flags on attachment: 88074

Committed r82846: <http://trac.webkit.org/changeset/82846>
Comment 11 WebKit Commit Bot 2011-04-04 10:47:27 PDT
All reviewed patches have been landed.  Closing bug.