Skip to content

SVN revision selection confused by cherry-picks #8

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

Open
ColMelvin opened this issue Apr 1, 2013 · 1 comment
Open

SVN revision selection confused by cherry-picks #8

ColMelvin opened this issue Apr 1, 2013 · 1 comment
Labels
Milestone

Comments

@ColMelvin
Copy link
Owner

A commit that is not in the SVN tree but does contain the "git-svn-id:" line (in the git commit) can be incorrectly identified as the desired SVN revision, despite not actually being in the SVN tree. This includes the special revisions, like BASE.

This is similar to the issues that older "git-svn" scripts had with cherry-picked revisions already in the SVN repository (when the git commit retained the git-svn-id: line).

@ColMelvin ColMelvin added this to the v0.2 milestone Dec 20, 2016
@ColMelvin
Copy link
Owner Author

The git-svn script identifies cherry-picks using the .rev_map file that it maintains per branch. This file stores the Git commit hash for each SVN revision in that branch. Thus, if the SVN revision is extracted from a commit and it doesn't match the hash stored in the .rev_map, then this clearly isn't the original commit - it must be a cherry-pick. Or so the implementation goes...

By pulling in Git::SVN, this could be accomplished using an existing mechanism.

@ColMelvin ColMelvin modified the milestones: v0.1.1, v0.2 Nov 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant