Re: wiki page improvment - proposal

[Jaromír Mikeš]

> Od: Reinhard Tartler <siretart at tauware.de>

> > Recently I had problem with adding new upstream release to repo.
> > So I am suggesting improvement of 
> http://wiki.debian.org/DebianMultimedia/DevelopPackaging page
> > by adding information how to apply new upstream release to existing repo in
> right way.
> > Is this way right ?
> >
> > $ cd /path/to/sources/
> > $ git checkout origin/upstream
> > $ git checkout -b upstream
> > $ git checkout master
> > $ git-import-orig /path/to/<package>_0.0.1.orig.tar.bz
> > $ git push alioth master
> > $ git push alioth upstream
> > $ git push alioth --tags
> 
> While not wrong, the following might be more elegant:
> 
> Instructions for updating a git branch:
> 
> $ git checkout master
> $ git pull
> # update local branches without switching to them
> $ git remote update
> $ git fetch alioth upstream:upstream
> $ git fetch alioth pristine-tar:pristine-tar
> 
> Instructions for merging a new upstream version:
> 
> $ git-import-orig --pristine-tar /path/to/<package>_0.0.1.orig.tar.bz
> # resolve merge conflicts, review your changes e.g. with `gitk`
> 
> Instructions for pushing new revisions:
> 
> # if happy, remove the --dry-run parameter
> $ git push alioth master upstream pristine-tar --tags --dry-run
> 
> 
> Assumptions in all cases
>  - in the source tree
>  - the remote 'alioth' is setup properly

Hi Reinhard,

can I edit wiki pages?

I think extension of  "Tasks for team members" section by this info would be nice

regards

mira