Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[config, merge] Validate username usage in merge source URL vs working copy URL #123

Open
aik099 opened this issue Jan 16, 2020 · 0 comments

Comments

@aik099
Copy link
Member

aik099 commented Jan 16, 2020

When --merge-source-url option of merge command (or connected config property for that working copy) has username specified (e.g. svn://[email protected]/svn/repository/trunk), but working copy URL doesn't contain username (e.g. svn://[email protected]/svn/repository/tags/stable), then svn merge command considers this as an external merge and won't populate svn:mergeinfo property during merge.

TODO:

  1. determine what we use as working copy identifier for config setting storage (just domain + path or also protocol or user)
  2. validate, that source/target merge URLs start with the same thing (same protocol, same user/password, same domain)
    • in the «\ConsoleHelpers\SVNBuddy\Command\MergeCommand::performMerge» method (or earlier)
    • when changing «merge.source-url» config setting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant