mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

added branch merging comments

Browse source 
Original commit message from CVS:
added branch merging comments
This commit is contained in:
Thomas Vander Stichele 2002-04-15 09:19:09 +00:00
parent b2d503d528
commit 6e8841efd9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/random/release
View file

@ -123,7 +123,13 @@ TODO :
GStreamer rocks.
- Later on, if necessary, merge back latest release branch to current dev
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 :