On Thu, Jul 23, 2009 at 8:53 AM, Evan Martin <[email protected]> wrote:
> On Thu, Jul 23, 2009 at 7:47 AM, Nicolas Sylvain<[email protected]> > wrote: > > gclient has nothing to do with this case. "svn update src/" was trying to > > add a directory called "src/bleh", but "src/bleh" already existed, so > "svn > > update" failed. > > Sorry to back-seat drive, but can't you do something like > "svn status | xargs rm -rf" > before syncing? svn status does not show files that are svn:ignore'd, like all generated files should be. But, that's a good point, the directory might not be ignored, so that can work. We already have code to do that and we do it on the try bots. This is really slow though, can take 1-2 minutes to run before each sync. > > > (In git it's a builtin: "git clean -f" to delete all files that aren't > officially part of the repository.) > > > The only thing gclient might want to do, is clobber your tree, and try > > again. We used to have stuff like that, but they are all disabled AFAIK, > I > > lost too many important files because gclient wanted to be nice and clean > up > > my machine. > > I don't understand this paragraph, which might explain why my above > proposal is dumb. An example that bit me in the past: You have a DEPS file that fetches src/blah. you add new code in src/blah, but before you commit, someone deletes the line "src/blah" in the DEPS file. At the time the default behavior was : "rm -rf src/blah", which killed all my new code in there. Maybe the non-versionned files are important. We can't kill them. (We could have a mode for buildbot only that is more aggressive though, since we are not likely to have important non-versionned files there). Nicolas --~--~---------~--~----~------------~-------~--~----~ Chromium Developers mailing list: [email protected] View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~----------~----~----~----~------~----~------~--~---
