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

Iviewer submodule removed #26

Closed
wants to merge 42 commits into from

Conversation

will-moore
Copy link
Member

This merges the iviewer submodule into the main omero-guides under /iviewer
while preserving the commit history from the submodule.

See discussion at #23 (comment)

I have tried to list the commands I used to do this (but there was some back-and-forth so might not be perfect)

$ cd path/to/omero-guides

# Having removed iviewer submodule (see first commit above)
# Tried to remove /iviewer dir since it causes conflicts otherwise
$ git rm iviewer
rm 'iviewer'
warning: Could not find section in .gitmodules where path=iviewer
$ git commit -m "delete old iviewer dir"


$ cd ../

$ git clone [email protected]:ome/omero-guide-iviewer.git
$ cd omero-guide-iviewer/

# we want a history of files in the docs dir 
$ git filter-branch --subdirectory-filter docs

# the contents of /docs are now top-level.
$ ls
Makefile		conf.py			images			index.rst		iviewer_rois.rst	iviewer_viewing.rst	make.bat

# Move into /iviewer...

$ mkdir iviewer
$ git mv images iviewer
$ git mv index.rst iviewer
$ git mv iviewer_rois.rst iviewer
$ git mv iviewer_viewing.rst iviewer
$ git commit -m "moved files to new subdirectory"

# delete other files...

$ rm Makefile 
$ rm conf.py 
$ rm make.bat
$ git add -u ./
$ git commit -m "Remove Makefile, conf.py and make.bat"

# pull into omero-guides...

$ cd ../omero-guides
$ git remote add iv ../omero-guide-iviewer
$ git fetch iv
$ git branch iv remotes/iv/master
$ git merge iv --allow-unrelated-histories

@jburel
Copy link
Member

jburel commented Sep 17, 2020

Since this mainly for discussion at this stage. Probably enough to do only iviewer

@jburel jburel mentioned this pull request Sep 17, 2020
@jburel
Copy link
Member

jburel commented Sep 18, 2020

https://omero-guides--26.org.readthedocs.build/en/26/iviewer/index.html looks as expected

Excluding this PR since we have not made a final decision about submodules/subprojects

Thanks @will-moore for looking into it.

--exclude

@will-moore will-moore closed this Sep 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants