Skip to content

[2018-11 LWG Motion 12] P1148R0 Cleaning up Clause 20 #2418

Closed
@jensmaurer

Description

@jensmaurer
Member

Activity

added this to the post-2018-11 milestone on Nov 10, 2018
zygoloid

zygoloid commented on Nov 12, 2018

@zygoloid
Member
self-assigned this
on Nov 15, 2018
burblebee

burblebee commented on Nov 16, 2018

@burblebee
Contributor

@zygoloid I assume you'll be the official reviewer for this paper? As with lwg-11, there's no PR so can't use that to assign the reviewer.

Also, the sources just list the files - how do we see the changes in diff form from that (so we can review, comment, etc.)? It seems there must be a way to do this in github (short of creating a PR from them).

jensmaurer

jensmaurer commented on Nov 17, 2018

@jensmaurer
MemberAuthor

@burblebee: We can only directly use the sources if we have a common ancestor in the git version tree. Even then, we need to rebase to a reasonably recent commit and resolve the conflicts. Otherwise, the sources are just helpful input to create our own commit (because we don't have to redo all the formatting). Since @zygoloid is working on this, I suspect he'll do exactly this.

timsong-cpp

timsong-cpp commented on Nov 17, 2018

@timsong-cpp
Contributor

As implied by the intro to the paper, the base LaTeX for strings.tex and iostreams.tex in my repo was copied from the version used to generate N4762, which is pretty recent.

JohelEGP

JohelEGP commented on Nov 17, 2018

@JohelEGP
Contributor

@burblebee: We can only directly use the sources if we have a common ancestor in the git version

I don't think that's true. I believe all you need is the same directory structure. Then you can add that other repository as a remote and apply its commits to yours.

I have done this with two repositories of mine to easily adopt improvement to files somewhat generic to my projects, like .travis.yml and CMake modules. So far, I've only cherry-picked changes, though.

zygoloid

zygoloid commented on Nov 20, 2018

@zygoloid
Member

@JohelEGP That doesn't really work very well here. The paper sources have taken our sources and added removed and added markup for many of the changes, but some of the changes (eg, adding bullets and index entries) are not marked up at all. The paper sources make a great starting point, but there's still a large amount of manual effort required to apply these changes and be sure that we're only changing the things that we intended to change. (Eg, we can't just take the .tex and remove the "removed" parts, because that might result in unrelated / unintended changes to other parts of the draft -- in particular, loss of changes made in the interim.)

added a commit that references this issue on Nov 26, 2018
1541a91
burblebee

burblebee commented on Nov 27, 2018

@burblebee
Contributor

Ignoring the apparent markup changes that @zygoloid spoke of in his comment above, I'd still like to know how to create a branch from a list of referenced source files, such as was supplied here. Is it really as tedious as downloading all the files, creating a reverse diff from them back to the original paper they were based on, and applying those diffs to the master sources? There's got to be a way to use github to do this, no?

jwakely

jwakely commented on Nov 27, 2018

@jwakely
Member

@burblebee Given a Git repo, just set it as a remote and pull from it into a new branch.

Given a bunch of source files (not in a Git repo), create a new local branch, replace the files in your branch with the ones from the "list of referenced source files", commit. Now you have a branch containing those sources.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Relationships

None yet

    Development

    No branches or pull requests

      Participants

      @zygoloid@jwakely@burblebee@timsong-cpp@JohelEGP

      Issue actions

        [2018-11 LWG Motion 12] P1148R0 Cleaning up Clause 20 · Issue #2418 · cplusplus/draft