Skip to content

Need to synchronize book images with progit2 repo #515

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

Closed
ben opened this issue Mar 8, 2015 · 7 comments
Closed

Need to synchronize book images with progit2 repo #515

ben opened this issue Mar 8, 2015 · 7 comments

Comments

@ben
Copy link
Contributor

ben commented Mar 8, 2015

Just one example: the second figure in Chapter 3's "Basic Merging" section looks like this (linked straight from that site):

…and should look like this (also linked from source):

Note the redundant C5 in the git-scm.com figure. There have been a number of fixes to the figures since these images were first generated, we should probably re-do whatever it is was done to bring them over in the first place. @schacon, do you still have the script you used for this?

@sxlijin
Copy link
Contributor

sxlijin commented Feb 7, 2017

@peff this is still an issue alongside #578! - see Figure 25.

Also, duplicate of #471.

@peff
Copy link
Member

peff commented Feb 8, 2017

Hmm, we already did this about 6 months ago in 6acf2e4. But then @jnavila pulled images in more recently via 4d71b81, and they seem to be in a different directory. So there are two confusions:

  1. Which of the images are we actually showing on the site? And can we drop the other ones?

  2. If we've pulled multiple times since this issue was opened, why do we still not have the fix?

@jnavila
Copy link
Contributor

jnavila commented Feb 8, 2017

  1. In fact, I just move the images that were already present in the gitscm repo. With the new script, we could get rid of the old paths (but keeping them would preserve links from external sites).
  2. IFAIK, the images were never pulled as is from the progit site since the first publishing of the book.

@peff
Copy link
Member

peff commented Feb 10, 2017

I did pull them over in #775, and you can see in that diff that the image pulled in there fixed this particular issue. I'm not sure why we're not serving them, though.

@peff peff mentioned this issue Feb 10, 2017
@jnavila
Copy link
Contributor

jnavila commented Feb 10, 2017

When rewriting the publish system, I had to copy all the files in a flat directory. Hopefully, there is no name collision. Maybe you could rerun your import script (what was the optimization btw?) just to make sure we have the latest version from the book.

@peff
Copy link
Member

peff commented Feb 10, 2017

I don't think I actually had an import script. I just did some shell hackery to grab all the images. I'll see if I can do that again, into your flat hierarchy.

@peff
Copy link
Member

peff commented Feb 10, 2017

Fixed by #952.

@peff peff closed this as completed Feb 10, 2017
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

4 participants