Karl
Karl

Reputation: 321

Eclipse SVN Commit error after repackage

Via Eclipse, I have repackaged my Android app. I wanted to commit my change, but I get SVN Commit has encountered a problem. Directory xyz is out of date. xyz is the old package name. This package shows up in Eclipse with a 2x2 box icon, with an x in the lower right corner. Any suggestions how I can fix this so my commit works and I eliminate the old package?

Upvotes: 3

Views: 17290

Answers (4)

Edison Agurto
Edison Agurto

Reputation: 336

Alternative Solution (Just in case the other top solutions don't works for you)

  1. Disconnect your project of SVN Repository. (rename disconnected project)
  2. Checkout the project again from SVN.
  3. Copy/Paste conflict folder or archives from disconnected project to new project donwloaded.
  4. Commit changes. Done!!

Upvotes: 0

ganime
ganime

Reputation: 129

I did an combination of the accepted answer and the second answer.

  1. Delete the offending folder from svn by typing this at the command prompt: svn delete svn+ssh://[path to offending folder]" --message "Commit message"
  2. The first step will leave Eclipse SVN plugin thinking the by-hand-deleted folder needs to be synced. Do a Team-> Update to head
  3. Even after Step 2, Eclipse detected a conflict : svn: E155015: Aborting commit: '[local path to the offending folder]' remains in conflict svn resolved [local path to the offending folder]

    fixed the problem.

Note: Step 1 uses the path at SVN, Step 3 needs the local path.

Upvotes: 0

Rodrigo Leitão
Rodrigo Leitão

Reputation: 959

I know this question is kinda old and I won´t give you a solution but...

I use to have this problem too (and other with svn in eclipse), usually it occurs when SVN needs to delete a folder and it parents (or a bigger tree then 2 folder).

Usually I just commit all I have to commit, and after it starts to encountering a problem with "out of date" I delete all the old folder tree directly on SVN. To do that I use the view "SVN Repositories". Then just do a full update at your project.

If you just do the update without perform the manual deletion of older folder, you´ll need update for each "leaf folder" you need to delete.

It doesn´t solve your (or mine) problem, but at least make this folder deletion faster...

Upvotes: 3

Peter Szanto
Peter Szanto

Reputation: 7722

Do a Team / Updete to Head on your project

Upvotes: 12

Related Questions