Re: Adopting unversioned directory on svn up

2016-12-06 Thread Olaf van der Spek
On Mon, Dec 5, 2016 at 12:51 AM, Johan Corveleyn  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


how to these changes from server in my case?

2016-12-06 Thread James
  I did the following on my workspace:   
   - made some changes in a folder called "src" from my working copy;
   - renamed the "src" folder which contains the changes to "src-mine";
   - updated the working copy and get that renamed folder, "src", from server 
again; now I have "src" and "src-mine" two folders;
   - made some different changes in the folder "src" from above #3;
   - checked in the changes from above #4;
   - deleted "src" folder and rename the "src-mine" back to "src";
   - now the "src" should be different from the "src" on the repository; The 
local "src" has some changes the repository doesn't have; and the repository 
"src" has some changes the local src doesn't have;
   - did update and try to get the changes from #4 but Tortoise failed to grape 
the changes from server;
   - tried command line update command, the same , nothing being updated from 
server; but we do have changes on the server;
how can I get these changes from server and merge them into my existing changed 
files?
Thanks,James