new subversion hell

#9939

For information, when you do renaming on folder or files, quite often,
Idea create a conflict in subversion - you know the red icon. This is
strange already and shouldn't happen IMHO, at least not when you're the
only one working on those files!

From that point on, as I understood after some research, the simpliest
way is to rollback. That's the strategy I've adopted up to know, and I
was quite successful - that is until today.

I had to rollback a renaming on directories where I had new uncommited
work. I thought only the upper directory would be renamed to the old
naming. The content was roolback too. That may be my fault as
everything below that directory was checked. Anyway, I counted on the
great Idea LocalHostory feature. But it didn't happen today.
Idea was displaying blue and green on the uncommited rollbacked sources
where subversion would detect nothing to commit. I reloaded the
project, and lost everything. I just lost hours of work.
And the LocalHistory doesn't seem to remember anything of those
uncommited classes :(

That seem like a serious bug to me. Unfortunately I won't be able to
provide a test case.

What would be great is to fix this weird SVN behaviour: creating
conflict where there are none. I hope someone see what I mean and can
corroborate my testimony.

And if any one knows how to get back my files from the History cache,
if by chances it still exist in there, that'd be even better but I
don't really count on it.

-nodje

1 comment
Comment actions Permalink

Local History: right click on a base directory in your project view and select
Local History -> Show History...

You should be able to see all edits, including deleted files.

n> #9939
n>
n> For information, when you do renaming on folder or files, quite
n> often, Idea create a conflict in subversion - you know the red icon.
n> This is strange already and shouldn't happen IMHO, at least not when
n> you're the only one working on those files!
n>
n> From that point on, as I understood after some research, the
n> simpliest way is to rollback. That's the strategy I've adopted up to
n> know, and I was quite successful - that is until today.
n>
n> I had to rollback a renaming on directories where I had new
n> uncommited
n> work. I thought only the upper directory would be renamed to the old
n> naming. The content was roolback too. That may be my fault as
n> everything below that directory was checked. Anyway, I counted on the
n> great Idea LocalHostory feature. But it didn't happen today.
n> Idea was displaying blue and green on the uncommited rollbacked
n> sources
n> where subversion would detect nothing to commit. I reloaded the
n> project, and lost everything. I just lost hours of work.
n> And the LocalHistory doesn't seem to remember anything of those
n> uncommited classes :(
n> That seem like a serious bug to me. Unfortunately I won't be able to
n> provide a test case.
n>
n> What would be great is to fix this weird SVN behaviour: creating
n> conflict where there are none. I hope someone see what I mean and can
n> corroborate my testimony.
n>
n> And if any one knows how to get back my files from the History cache,
n> if by chances it still exist in there, that'd be even better but I
n> don't really count on it.
n>
n> -nodje
n>


0

Please sign in to leave a comment.