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

Version/history #25

Merged
merged 13 commits into from
Nov 13, 2014
Merged

Version/history #25

merged 13 commits into from
Nov 13, 2014

Conversation

peterdesmet
Copy link
Member

Replaying the version history.

@peterdesmet peterdesmet mentioned this pull request Nov 13, 2014
@peterdesmet
Copy link
Member Author

This PR should not be merged until the full version history is in here.

@tucotuco
Copy link
Member

OK, the full version history is in this branch. I propose to:

  1. checkout master
  2. remove the .md files
  3. commit and push empty master
  4. merge branch version/history into master
  5. checkout master
  6. tag 12 releases (with date, such as "2009-10-08" for standard releases at least)
  7. add .md files back again
  8. add the downloads folder and its contents (as in branch version/2014-11-08)
  9. commit and push master
  10. remove branch version/2014-11-08 without merging

Any objections or comments?

@peterdesmet
Copy link
Member Author

Hi @tucotuco, I read through your steps carefully, and that seems the correct approach to me. Let me know if you want me to tag and/or create releases. :shipit:

tucotuco pushed a commit that referenced this pull request Nov 13, 2014
@tucotuco tucotuco merged commit 859448f into master Nov 13, 2014
@tucotuco
Copy link
Member

@peterdesmet Steps 1-5 done. Go ahead and make the tags, then I can do steps 7-10.

@peterdesmet
Copy link
Member Author

What names do you want for the tags: just the date (2014-11-08)? Do you want anything special to indicate pre-releases?

@tucotuco
Copy link
Member

Hmm. For the first release, "v1.4 Draft Standard".
For those up to the first standard release, "yyyy-mm-dd Pre-standard".
For the standard releases, just the date.

Seem reasonable?

@peterdesmet
Copy link
Member Author

Tags have been created, which GitHub automatically translated to releases with zips: https://github.com/tdwg/dwc/releases. I could not use spaces in the tag names though. We can add a nicer title and release notes to the releases if we want... let me know.

I tested the zip 2011-10-26: its decision history goes to 2011-10-16_10, which seems correct.

You can bring back the md files and clean up.

@peterdesmet
Copy link
Member Author

Should I add the relevant decisions to the release notes?

@tucotuco
Copy link
Member

Though a sent a message directly, I guess this is better to get here into
Github.

I saw all of the releases. Looks great except for the first one. I edited
it to describe that release. It should be the 2009-02-12 Pre-standard
release and there should be one before that for the Draft version 1.4,
which was a completely different beast.

So, I'm not sure the tag itself can be edited, but it can be deleted and
another two made in its place. But don't lose the description I added to
the 2009-02-12 release.

Make sense?

I don't see a need to add the decisions to the release notes.

On Thu, Nov 13, 2014 at 2:54 PM, Peter Desmet notifications@github.com
wrote:

Should I add the relevant decisions to the release notes?


Reply to this email directly or view it on GitHub
#25 (comment).

@peterdesmet
Copy link
Member Author

Just to make sure I get this right:

  • commit dd3c61c should get the tag 2009-02-12-pre-standard, keeping the current release description.
  • commit c17a5b5 should get the tag v1.4-draft-standard, with its own release.

@tucotuco
Copy link
Member

Correct.

On Thu, Nov 13, 2014 at 3:18 PM, Peter Desmet notifications@github.com
wrote:

Just to make sure I get this right:

  • commit dd3c61c
    dd3c61c
    should get the tag 2009-02-12-pre-standard, keeping the current
    release description.
  • commit c17a5b5
    c17a5b5
    should get the tag v1.4-draft-standard, with its own release.


Reply to this email directly or view it on GitHub
#25 (comment).

@peterdesmet
Copy link
Member Author

@tucotuco tucotuco deleted the version/history branch November 13, 2014 14:45
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.

2 participants