Home/ Questions/Q 7790039
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-01T21:28:04+00:00

A switch went wrong and I committed some files to a a different branch

  • 0

A switch went wrong and I committed some files to a a different branch instead of the trunk; yet some other dirs made it to the trunk.

How do I revert the branch to its previous state?

I went into the branch and wanted to reverse merge:

/fnord/foo/thisFolderShouldNotBeHereButInTrunk

svn merge -r 5651:5650 fnord/foo/
--- Reverse-merging r5651 into '.':
   C foo
Summary of conflicts:
  Tree conflicts: 1

This folder was added by the commit. It should have been added in the trunk though. And I did exactly that already. Was that my mistake?

How do I resolve this?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    A half switched checkout happens sometimes. Usually when the switch aborts halfway of you switch just one file or folder in stead of the entire working copy.

    A mistake like this is best fixed manually. Just switch the entire working copy to the branch and remove the folder(s) yourself using svn remove and commit that change to the branch. You can then switch back to trunk and add the directory there by hand or merge the revision that added the folder(s) to the branch by mistake.

    • 0