Home/ Questions/Q 3217880
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-17T15:27:46+00:00

Is this a nasty Subversion bug or am I approaching it the wrong way?

  • 0

Is this a nasty Subversion bug or am I approaching it the wrong way?

Merge a branch into a trunk.
->HelloWorld.txt updates

Revert HelloWorld.txt

Do the same merge again.
->No files update.

Why doesn’t the second merge update HelloWorld again? It’s acting as if that change has already been copied over. Shouldn’t the revert reset it?

If you revert the entire folder HelloWorld is in, the second merge properly applies the change again. It’s only if you revert a file that it fails.

This is a little scary. What if I need to revert some files for now. Any future merge will silently fail to copy over critical code.

Subversion 1.6
OS X 10.6.4

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Subversion performs merge tracking, meaning it will record what revisions have already been merged. The merge info is recorded in a property called svn:mergeinfo on the root of the merge (ie whatever you entered as target after svn merge). You reverted the file, but probably didn’t revert the merge root that contains the modified or added svn:mergeinfo property.

    • 0