Pull Submitted!

[David A. Harding]

The pull has been submitted:

https://github.com/bitcoin/bitcoin.org/pull/393

Congratulations to all of us!

Now that the squashed branch is the official branch, you should not be
adding commits on top of any branch based off of Saīvann's old dev
branch, which is what we've been doing. (If you have work you haven't
submitted yet, don't worry about it: we can use git cherry-pick to get
what we need.)

From this point until the pull request above get merged, you want to
base your pulls off of the devel-docs branch in the main bitcoin.org
repository. (After the merge, we'll establish a new workflow.)

Saīvann, me, and maybe some others plan to backup our old unsquashed
histories for posterity. The simple way to do that is just to make a
copy of your entire checked out repository. A less simple way is to
delete all unneeded references, create a bare repository, and back that
up. I'll post directions for that later tonight or tommorow just as
soon as I do it myself.

If you have any questions about anything, please don't hesitate to
reply to this message on or off list.

Congratulations again!

-Dave
--
David A. Harding

[Saïvann Carignan]

Fantastic!

I will announce this to the mailing list in a few hours.

I have just added a TODO list on the pull request description, since we
already have some feedback, so we can agree with what needs to be done
and keep track of what is done.

Saïvann

[David A. Harding]

On Sat, May 10, 2014 at 08:25:22PM -0400, David A. Harding wrote:
> Saīvann, me, and maybe some others plan to backup our old unsquashed

> histories for posterity. I'll post directions for that later tonight

> or tommorow just as soon as I do it myself.

Whoops. I forgot and just went about my merry business. :-)

I created a separate GitHub repository with the old history:

https://github.com/harding/old-docs-history-bitcoin.org

I plan to keep that repository around unless it becomes
inconvenient, but you can make a real quick backup yourself (takes
about 8.7 MiB of space):

git clone --bare \
https://github.com/harding/old-docs-history-bitcoin.org.git \
old-docs-history-bitcoin.org.git

tar xjf old-docs-history-bitcoin.org.git.tar.bz2 \
old-docs-history-bitcoin.org.git

rm -rf -- old-docs-history-bitcoin.org.git
## Then backup old-docs-history-bitcoin.org.git.tar.bz2

You can verify online (or in your bare repository) that the commit id
for that branch is the same one as in the log message for the squashed
commits:

https://github.com/harding/old-docs-history-bitcoin.org/commits/old-docs-history

Now that I have a backup, I'm going to delete all of my branches derived
from Saïvann's dev branch.

Sorry for the delay in writing these instructions,

[Saïvann Carignan]

I was wondering if I should delete the saivann/dev branch once this is
merged on bitcoin.org so new contributors don't mistakenly send pull
reqs or issue there.

Maybe this can be discussed at the same time we decide future
instructions for contributors.

Saïvann