On Mon, Dec 5, 2016 at 12:51 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> I don't understand what you're trying to say here. There are always
> files involved, no? I don't care about the directories themselves in
No, see my initial example:
# svn up /etc
Updating '/etc':
C /etc/php5
A /etc/php5/cli
A /etc/php5/cli/conf.d
A /etc/php5/cgi
A .
Updated to revision 55.
Tree conflict on '/etc/php5'
> local dir unversioned, incoming dir add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: h
The only conflict here is the directory /etc/php5.
I'm not sure what it did though.. the sub-dirs show A instead of C here.
> this case. I'm talking about the --force behaviour of "incorporating"
> existing files to make them part of a checkout that's being checked
> out over an existing tree.
>
>> How often does such an accidental checkout happen anyway?
>
> I have no idea. I suppose it happens from time to time. But in any
> case this discussion is a bit pointless ... we won't change the
> default "non-forcing" behaviour of 'svn checkout', simply because it's
> breaking backwards compatibility.
I'm not sure what that means in this case.. surely Subversion has
changed behavior before?
>> What about checking whether the destination directory exists before
>> the checkout and confirming the checkout is desired if it does exist
>> already?
>
> Yep, that's a good suggestion. As a matter of fact, Patrick Steinhardt
> is currently working on something like this. See this dev@ mail [1]
> with his latest patch. You might want to take a look (the commit
> message in the mail contains a good description of the behaviour).
>
> [1] https://lists.apache.org/thread.html/9ef6d2351c01865ba2e96537fb7b4aa3ff1752b1ace7dd4a95a4e151@%3Cdev.subversion.apache.org%3E
Looks good, thx.
--
Olaf
Received on 2016-12-06 19:15:58 CET