svn import sometimes thinks that changes on trunk aren't on its branch

Bug #121569 reported by Michael Hudson-Doyle
16
Affects Status Importance Assigned to Milestone
Launchpad CSCVS
Low
Unassigned

Bug Description

This is a bit strange, and I don't really understand it.

Sometimes an import from svn will start ignoring changes to the mirrored branch with messages like:

WARNING:root:ignored change outside branch: action=M path=u'/trunk/BigWigs/TheEye/Alar.lua' copyfrom_revision=None copyfrom_path=None

(the branch being mirrored is "/trunk/BigWigs" here). Unsurprisingly this leads to masses of validation failures.

I have a hunch that this may be connected to the "svn rm trunk; svn mv branches/blah trunk" style of svn "merging", but have no firm evidence of this.

Tags: svn Edit Tag help
Revision history for this message
David Allouche (ddaa) wrote :

The code that filters changes is the following:

            if change['path'].startswith('/' + self.branch_path + '/'):
                result.append(change)
            else:
                self._logIgnoredChange(change)

The added leading slash is intentional and is needed because of how cscvs internally represents svn branches.

It is true that svn "merging" by replacing the branch would cause cscvs to fail, but only if the moved directory is the branch root or above. In the WARNING message you mention, the change occurs below the branch root.

Revision history for this message
David Allouche (ddaa) wrote :

Confirmed bug. Medium importance.

Changed in launchpad-cscvs:
importance: Undecided → Medium
status: New → Confirmed
Revision history for this message
Philipp Schlesinger (philipp-sadleder) wrote :

This branch is also affected by that bug: https://code.launchpad.net/~vcs-imports/mpich/trunk

tags: added: svn
Changed in launchpad-cscvs:
importance: Medium → Low
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Related questions