From 1bb04aa1c0e1773bc0e97b0d61446eb113eec979 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 1 Jun 2009 17:52:11 +0000
Subject: [PATCH] Remove the use of --non-recursive flag.

Review URL: http://codereview.chromium.org/115994

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@17328 0039d316-1c4b-4281-b951-d872f2087c98
---
 gcl.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcl.py b/gcl.py
index 38899518c..3a4503d9c 100755
--- a/gcl.py
+++ b/gcl.py
@@ -879,7 +879,14 @@ def Commit(change_info, args):
            " the commit. May the --force be with you.")
     return
 
-  commit_cmd = ["svn", "commit", "--non-recursive"]
+  # We face a problem with svn here: Let's say change 'bleh' modifies
+  # svn:ignore on dir1\. but another unrelated change 'pouet' modifies
+  # dir1\foo.cc. When the user `gcl commit bleh`, foo.cc is *also committed*.
+  # The only fix is to use --non-recursive but that has its issues too:
+  # Let's say if dir1 is deleted, --non-recursive must *not* be used otherwise
+  # you'll get "svn: Cannot non-recursively commit a directory deletion of a
+  # directory with child nodes". Yay...
+  commit_cmd = ["svn", "commit"]
   filename = ''
   if change_info.issue:
     # Get the latest description from Rietveld.