mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-09-04 11:14:10 +00:00
added branch merging comments
Original commit message from CVS: added branch merging comments
This commit is contained in:
parent
b2d503d528
commit
6e8841efd9
1 changed files with 7 additions and 1 deletions
|
@ -123,7 +123,13 @@ TODO :
|
||||||
GStreamer rocks.
|
GStreamer rocks.
|
||||||
- Later on, if necessary, merge back latest release branch to current dev
|
- Later on, if necessary, merge back latest release branch to current dev
|
||||||
branch (if patches to source were made)
|
branch (if patches to source were made)
|
||||||
FIXME: add commands and guide for this
|
* change to a HEAD branch, make sure it's updated
|
||||||
|
* cvs diff -r RELEASE-0_3_4-30SECONDFRENCHMAN -R
|
||||||
|
gives a list of differences between head and release tag
|
||||||
|
* cvs update -j BRANCH-RELEASE-0_3_4
|
||||||
|
merges the difference made in that branch to the current source
|
||||||
|
this is what you want to use when merging back the branch
|
||||||
|
resolve conflicts and commit
|
||||||
|
|
||||||
Some various random comments that might or might not make sense :
|
Some various random comments that might or might not make sense :
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue