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

Show how to view changes to the SVN files in VS Code #86

Open
hturner opened this issue Jan 12, 2024 · 5 comments
Open

Show how to view changes to the SVN files in VS Code #86

hturner opened this issue Jan 12, 2024 · 5 comments
Assignees
Milestone

Comments

@hturner
Copy link
Member

hturner commented Jan 12, 2024

If we turn off the connection to git repo (#85) it is much easier to track changes to the SVN repo (or repos) that people have checked out.

It would be good to include a screen shot of this as part of one of the demos.

It would be something like

image

image

But probably based on on the askYesNo example, so that we can include it after this step in the Contribution Workflow: https://contributor.r-project.org/r-dev-env/tutorials/contribution_workflow/#2-editing-source-code or perhaps as another mini help page "Viewing changes" with a note on how to open the accessible diff viewer (three dots menu/F7).

@hturner
Copy link
Member Author

hturner commented Jan 12, 2024

It seems that VS Code forgets about the SVN repo if you close and restart the workspace. However you can get the source control pane to recognise it again by running an SVN command that connects to the remotes repository, e.g.

cd $TOP_SRCDIR/r-devel
svn update

to bring in the latest updates, or

svn diff -r BASE:HEAD .

if we just want to see what has changed since we checked out the repository. As this is a little involved, it is probably best to make a separate help page on viewing changes.

@StarTrooper08 StarTrooper08 self-assigned this Jan 14, 2024
@hturner
Copy link
Member Author

hturner commented Jan 19, 2024

I had another look at this and found a setting which seems to fix the issue of SVN repos not appearing in the Source Control pane when you restart:

"svn.multipleFolders.enabled": true

Can you add this to the settings.json? Then people shouldn't need to run the commands in my last comment just to get VS code to detect the repo.

@StarTrooper08
Copy link
Collaborator

StarTrooper08 commented Jan 26, 2024

Adding to devcontainer.json file did the work

"svn.multipleFolders.enabled": true

@hturner
Copy link
Member Author

hturner commented Feb 2, 2024

#88 fixes the issue of SVN repos being forgotten about when the codespace is restarted.

So now we can go back to the original issue in #86 (comment), i.e. add an example of viewing the changes to askYesNo.R in the contributor workflow example.

@StarTrooper08
Copy link
Collaborator

If we turn off the connection to git repo (#85) it is much easier to track changes to the SVN repo (or repos) that people have checked out.

It would be good to include a screen shot of this as part of one of the demos.

It would be something like

image

image But probably based on on the askYesNo example, so that we can include it after this step in the Contribution Workflow: https://contributor.r-project.org/r-dev-env/tutorials/contribution_workflow/#2-editing-source-code or perhaps as another mini help page "Viewing changes" with a note on how to open the accessible diff viewer (three dots menu/F7).

I think we can just add this inside "Updating source code page"

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

No branches or pull requests

2 participants