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.

Sign up for GitHub

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

Jump to bottom

Production upgrade generation fails after unbranch when using Git #31

Closed
rtweeks opened this issue Jul 5, 2019 · 0 comments · Fixed by #32
Closed

Production upgrade generation fails after unbranch when using Git #31

rtweeks opened this issue Jul 5, 2019 · 0 comments · Fixed by #32
Assignees
@rtweeks
Labels
bug

Comments

@rtweeks
Copy link
Owner

rtweeks commented Jul 5, 2019

If the tutorial step for merging changes to the structure directory is followed using a Git repository, it is no longer possible to generate a production script (xmigra upgrade --production) because of the change to the migration file made by xmigra unbranch. This is implemented in the check at

xmigra/lib/xmigra/vcs_support/git.rb

Line 200 in ac29b7d

# Check that the migration has not changed in the currently checked-out branch

@rtweeks rtweeks added the bug label Jul 5, 2019
@rtweeks rtweeks changed the title Production upgrade generation fails after unbranch Production upgrade generation fails after unbranch when using Git Jul 5, 2019
@rtweeks rtweeks self-assigned this Jul 5, 2019
rtweeks added a commit that referenced this issue Jul 6, 2019
@rtweeks
Correct "migration not changed" test for Git VCS
ac8ea5a 
Because Git doesn't bind commits to branches (the concept doesn't even
make sense), there is no way to check if a migration file is "unchanged
since committed to the production branch" as can be done in Subversion.
The closest-to-equivalent check is that the migration file as it exists
in the working copy has the same content as in the head of the
centrallized master branch (specified with the `xmigra-master` Git
attribute). This leaves it up to hooks in the central repository or
the merge review process to ensure the migration files in the master
branch do not change.

Issues: #31
This was referenced Jul 6, 2019
Merged
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@rtweeks rtweeks

Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Correct Git test for "migration files unchanged" rtweeks/xmigra
1 participant
@rtweeks