RE:

> -----Original Message-----
> From: Gross, Joseph S [mailto:joseph.s.gross_at_intel.com]
> Sent: 26 October 2011 01:45
> To: users_at_subversion.apache.org
> Subject:
>
> Hi,
>
> Encountered the following error. I had used a switch to move
> a large folder of data from a time-indexed area to an archive
> area. After the switch, it seemed as though the data did not
> move correctly, so I did a cleanup. In the time-indexed area
> I then saw some conflicted tree issues, and tried to look at
> the "edit conflict" dialogue. It gave options: "keep the
> directory from the repository" and "mark the conflict as
> resolved" since I assumed that the data was lost (I didn't
> get anything to move into the archive area) I tried keep
> directory from repository and got this error.
>
> -Joe

Hi Joe,

You seem to be using TortoiseSVN 1.6.8 from April 2010. If you had a newer version (1.6.16) the dialog would have told you you can copy/paste the text from the dialog using <CTRL><C> <CTRL><V>, then you could have posted in plain text...

Have you sorted this problem yet? If not, I'm afraid I do not fully understand your problem description, what do you mean by "time indexed"? Just that the folders are named using date/time? What happens if you get a fresh checkout and compare to what you wanted?

~ mark c
Received on 2011-10-26 10:05:08 CEST