Skip to content

[merge] Settings from merge source repository not applied, when listing mergeable revisions #126

Open
@aik099

Description

@aik099

Here is my setup:

  1. 2 working copies checked out using svn://username@domain/projects/project/trunk and svn://username@domain/projects/project/tags/stable URLs;
  2. merge source URL of svn://username@domain/projects/project/tags/stable is auto-guessed as svn://username@domain/projects/project/trunk;
  3. merging inside svn://username@domain/projects/project/tags/stable working copy;
  4. when displaying mergeable revisions settings (for revision list) are pulled from svn://username@domain/projects/project/trunk, but in reality settings are stored in svn://domain/projects/project/trunk.

It happens like this because:

  • when displaying results of svn-buddy.phar log command within a working copy from svn://username@domain/projects/project/trunk the username@ part is stripped off (probably because the user is authenticated anyway);
  • when displaying results from svn://username@domain/projects/project/trunk URL directly (not via working copy) the username part isn't stripped off (not sure why);
  • at the end settings are stored into one place but read from another place.

Metadata

Metadata

Assignees

No one assigned

    Type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions