Summary
synchronize changes made in wiki manual with manual in core repository
Metadata
- Id: 3b5717b02481951ad9430b5e2417beb469652054
- Trac id: 141
- Type: defect
- Reporter: felix
- Owner: felix
- Cc: iraikov
- Status: closed
- Component: documentation
- Estimated difficulty:
- Resolution: fixed
- Priority: major
- Milestone:
- Version: 4.2.x
- Changetime: 2010-03-11 10:33:12 UTC
- Created: 2009-12-05 22:14:31 UTC
- Keywords: manual wiki
Attachments
- 3b5717b02481951ad9430b5e2417beb469652054/attachments/svn-16089-16552.patch.txt
- 3b5717b02481951ad9430b5e2417beb469652054/attachments/svn-16552-16579.patch.txt
Description
The manual in the wiki has been heavily modified. These changes have to be merged into the manual of the core git repository, carefully avoiding moving any changes from the core back to the wiki that contain yet unreleased features.
Changes and comments
[2009-12-06 03:51:41 UTC] zbigniew changed status from new to accepted
[2009-12-06 07:21:22 UTC] zbigniew wrote:
I've synchronized the changes from the wiki to the core manual, ignoring anything that has been removed from core. I did not synchronize anything from core back to the wiki.
I am still trying to figure out how to use git correctly and safely (@#$!@%) and I don't want to delay this commit. So instead of pushing to the repository I am attaching the output of git-format-patch on my branch. I think you can apply this with git-am and perhaps squash it into one commit.
If you want me to do a proper merge instead, I need a bit of time so I can figure out what the heck I am doing. ($%#!) Sorry, git makes me feel more stupid than usual.
[2009-12-06 07:27:03 UTC] zbigniew attached svn-16089-16552.patch.txt (description=SVN 16089-16552 (part 1--grr, 256KB upload limit))
[2009-12-06 07:27:31 UTC] zbigniew attached svn-16552-16579.patch.txt (description=Part 2 SVN 16552-16579)
[2009-12-06 13:12:02 UTC] felix changed owner from zbigniew to felix
[2009-12-06 13:12:02 UTC] felix wrote:
Replying to zbigniew: > I've synchronized the changes from the wiki to the core manual, ignoring anything that has been removed from core. I did not synchronize anything from core back to the wiki. >
Excellent. Thanks a lot.
> I am still trying to figure out how to use git correctly and safely (@#$!@%) and I don't want to delay this commit. So instead of pushing to the repository I am attaching the output of git-format-patch on my branch. I think you can apply this with git-am and perhaps squash it into one commit.
I'll add it, no problem.
> > If you want me to do a proper merge instead, I need a bit of time so I can figure out what the heck I am doing. ($%#!) Sorry, git makes me feel more stupid than usual.
I feel just the same.