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

cmd: revert changes to note about nested --subdir repos in init #1661

Merged
merged 60 commits into from
Aug 5, 2020
Merged

cmd: revert changes to note about nested --subdir repos in init #1661

merged 60 commits into from
Aug 5, 2020

Conversation

jorgeorpinel
Copy link
Contributor

@jorgeorpinel jorgeorpinel commented Aug 5, 2020 •
edited
Loading

No description provided.

jorgeorpinel and others added 30 commits July 22, 2020 14:44
@jorgeorpinel
cmd: review repro examples
d04f082 
per #1572 (comment)
@jorgeorpinel
cmd: fic tyupo in get-url
a201abf
@jorgeorpinel
Merge branch 'master' into jorge
f7d1a7e
@jorgeorpinel
cmd: updates to repro
fe8687e 
per #1572 (review)
@jorgeorpinel
cmd: rewrite repro -P desc
f3df9d5 
rel #1572 (review)
@jorgeorpinel
cmd: simplified and generalize repro targets desc and DVC file mention
ebc1560 
per #1572 (comment)
and #1572 (comment)
@jorgeorpinel
cmd: minor update for repro desc wording
9a8c977 
per #1572 (comment)
@jorgeorpinel
term: don't use "synchronize" in the context of checkout
c38ce31
@sarthakforwet
cmd: rewrite Downstream example and added info for sequential executi…
34217b8 
…on of stages
@jorgeorpinel
Update content/docs/command-reference/repro.md
a071b7d
@jorgeorpinel
Update content/docs/command-reference/repro.md
edff33e
@jorgeorpinel
Update content/docs/command-reference/repro.md
71a5088
@sarthakforwet
cmd: Updated Downstream example
163ed19
@jorgeorpinel
Update content/docs/command-reference/repro.md
cf873a4
@sarthakforwet
repro: Updated Downstream example
ca04fb0
@sarthakforwet
Merge branch 'repro_misc' of github.com:sarthakforwet/dvc.org into re…
dded2d7 
…pro_misc
@jorgeorpinel
Update content/docs/command-reference/repro.md
30ce7bb
@sarthakforwet
cmd: updated last para for the description of --downstream and improv…
66e0603 
…ed formatting
@jorgeorpinel
Merge branch 'master' into jorge
05f0157
@jorgeorpinel
cmd: review language of init --subdir
e532010
@jorgeorpinel
term: revuew usage of "granular", esp. around init --subdir
b0fe9c1
@sarthakforwet
repro.md: updated Downstream example
8597f53
@jorgeorpinel
cmd: improve init --subdir explanation
8ca9134
@jorgeorpinel
cmd: add info about nested subrepos to init
8134010
@jorgeorpinel
cmd: fix -P option desc.
a5db93f 
per #1615 (review)
@jorgeorpinel
cmd: improve explanation on how --subdir affects commands
40512a1 
per #1615 (review)
@jorgeorpinel
cmd: simplify nested structures explanation in init
1f77e8f 
per #1615 (comment)
@jorgeorpinel
Merge branch 'master' into jorge
d4bd8f8
@jorgeorpinel
guide: add note aboud cp not being a download in external deps
42b670f 
per #1643 (review)
@jorgeorpinel
cmd: add note about what --cwd means to repro
d30bc63 
per iterative/dvc#4292 (comment)
@jorgeorpinel
Merge branch 'jorge' of github.com:iterative/dvc.org into jorge
38dfee7
@jorgeorpinel
term: remove "just" from -j desc in 3 refs
fd2a9bb 
per eda27fc
@jorgeorpinel
Merge branch 'master' into jorge
8d5adf7
@jorgeorpinel
cmd: add command examples to init --subdir use cases
221ed75 
per #1615
@jorgeorpinel
cmd: explain nested repo and projects of all kinds outside of --subdir
d14e960 
per #1615 (review)
@jorgeorpinel
cmd: remove bold names to nested and not-nested structure examples in…
5b47bd4 
… init --subdir

per #1615 (review)
@jorgeorpinel
cmd: standardize --jobs option in all refs
80a0f09 
per #1615 (review)
et al.
@jorgeorpinel
cmd: add speed note to --jobs desc in all refs.
5078044 
per #1615 (review)
@jorgeorpinel
cmd: change versioning command example in init
f176872 
per #1615 (review)
@jorgeorpinel
cd: change repo comments in init --subdir examples
cac92e5 
for #1615 (review)
@jorgeorpinel
cmd: improve note on DVC submodules a little
d1f9d24 
for #1615 (review)
@jorgeorpinel
cmd: better explain why isolation is important in --subdir bullet
8d854a1 
per #1615 (review)
@jorgeorpinel
cmd: split last --subdir cases explicitly as 2 bullets
be5bc6d 
per #1615 (comment)
@jorgeorpinel
cmd: remove most notes and code block examples about nesting projects…
9c3ba77 
…/repos in init

per #1615 (review)
@jorgeorpinel
cmd: add basic text about nesting to init
33ec1fa
@shcheklein shcheklein temporarily deployed to dvc-landing-cmd-init-ne-vlgkrm August 5, 2020 19:16 Inactive
@jorgeorpinel jorgeorpinel changed the title Cmd/init/nesting Explain project/repo nesting in init ref. Aug 5, 2020
@jorgeorpinel jorgeorpinel changed the title Explain project/repo nesting in init ref. cmd: explain project/repo nesting in init ref. Aug 5, 2020
shcheklein
shcheklein reviewed Aug 5, 2020
View reviewed changes
content/docs/command-reference/init.md Outdated
@@ -100,6 +100,54 @@ DVC sets the `core.no_scm` config option value to `true` in the DVC
that even if the project is tracked by Git, or if Git is initialized in it
later, DVC will keep operating detached from Git in this project.

### Nested DVC projects and repositories
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing PR this way makes it hard to review (we lost the context since we removed the whole section somewhere else). :(

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's revert the way it was before please and then do changes on top?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already reverted all of the changes about this in the previous PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I think you mean having the code blocks back in the --subdir section... Hold on ⌛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted for now but those changes were already merged to master so reverting here looks like a change. This is still a draft BTW, not quite ready for review.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can remove the new section here, and then we can merge this, so a following PR shows you the changes they way I think you'd like to see them ⌛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready.

@jorgeorpinel jorgeorpinel requested a deployment to dvc-landing-cmd-init-ne-vlgkrm August 5, 2020 22:25 Abandoned
@jorgeorpinel jorgeorpinel temporarily deployed to dvc-landing-cmd-init-ne-vlgkrm August 5, 2020 22:28 Inactive
@jorgeorpinel jorgeorpinel marked this pull request as ready for review August 5, 2020 22:28
@shcheklein shcheklein merged commit 085ec59 into master Aug 5, 2020
@jorgeorpinel jorgeorpinel changed the title cmd: explain project/repo nesting in init ref. cmd: revert changes to note about nested --subdir repos in init Aug 5, 2020
@jorgeorpinel jorgeorpinel mentioned this pull request Aug 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shcheklein shcheklein shcheklein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jorgeorpinel @shcheklein @sarthakforwet @restyled-commits