If you're contributing patches that other folks are committing, and at
least one of your patches deletes a file, you may run into an issue where
the deleted file remains in your local svn history (but not on the file
system) even after syncing with the repo and merging the committed changes.
The way you can tell if this applies to you is by running "svn status" from
the command line. For example,
$ svn status subsystem/
D
subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
The 'D' says it all. While this condition persists, the deleted files will
appear in all subsequent patches creating a headache for the committer. At
least one way to resolve this issue is "svn update" followed by "svn
resolve". For example,
$ svn update
subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
C
subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
At revision 1083035.
Summary of conflicts:
Tree conflicts: 1
$ svn status subsystem/
! C
subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
> local delete, incoming delete upon update
$ svn resolve --accept=working
subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
Resolved conflicted state of
'subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java'
The deleted file should no longer show up under "svn status" or in your
patches.
~John
