cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marc-Aurèle Brothier <ma...@exoscale.ch>
Subject Maven standard: PR to rebase & where is gone the file history?
Date Mon, 22 Jan 2018 08:47:34 GMT
Hi everyone,

PR which moved all the files to follow the maven standard for the file
structure has been merged on master, therefore all files are now located at:
- src/main/java for the java code
- src/main/resources for the resources
- src/main/webapp for the webapp
- src/main/scripts for an scripts
- src/test/java for the java test code
- src/test/resources for test resources


*Github file history*
For those who are used to look at the file history in github, you will have
the impression that it's gone due to the move. It's an issue on github, not
in the repository. From the command line, you simply have to add the
parameter --follow to have a file history to fllow the move. Github hasn't
implemented it in their web view. Most IDE will add the --follow to your
files history.
git log --follow <file>

If you wish to have the --follow implemented on github, you should send
them a ticket so they add some +1 on their features todo list.

*PR to rebase*
Due to the file move, most of the PRs need a rebase action. Those should be
straightforward since git will naturally move the changes to the new file
location. If you have created a new file, you will have to move it to the
correct directory structure. After pulling master, to perform the rebase,
given XX the number of commits in your PR, you can run:
git rebase --onto master HEAD~XX <name-of-the-branch>

Sorry for that, but there was no way around to make it smoother.

Cheers,
Marc-Aurèle

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message