Mer/Build/UsingGitorious - Revision history

imported_>amigadave: {{Mer}}

2010-09-22T12:04:39Z

← Older revision		Revision as of 12:04, 22 September 2010
Line 1:		Line 1:
			{{Mer}}

	== Packaging ==		== Packaging ==
	Note that the detailed cut'n'paste instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions\|will need tweaks]] - though they can still be used.		Note that the detailed cut'n'paste instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions\|will need tweaks]] - though they can still be used.
Line 635:		Line 637:

	So if you have a newer git you don't need to add the right "-b <branch>" to each of the --track options.		So if you have a newer git you don't need to add the right "-b <branch>" to each of the --track options.

	~~[[Category:Mer]]~~

imported_>lbt: add dpk-source instructions

2009-08-05T21:16:24Z

add dpk-source instructions

← Older revision		Revision as of 21:16, 5 August 2009
Line 64:		Line 64:
	mkdir gitify		mkdir gitify
	cd gitify		cd gitify
			either:
	tar xf ../$TARBALL		tar xf ../$TARBALL
			or
			dpkg-source -x ../$PKG*.dsc
			rm -f *
			(rm -f * removes the dpkg-source cruft)

			Then
	mv * ../$PKG		mv * ../$PKG
	cd ..		cd ..

imported_>lbt: --track needs -b in the Mer SDK git so make it the default

2009-08-05T10:20:52Z

--track needs -b in the Mer SDK git so make it the default

← Older revision		Revision as of 10:20, 5 August 2009
Line 196:		Line 196:

	Get the master branch		Get the master branch
	git checkout --track origin/master		git checkout --track origin/master -b master
	or		or
	git checkout master		git checkout master
Line 233:		Line 233:
	git clone git@gitorious.org:mer/$GPKG.git		git clone git@gitorious.org:mer/$GPKG.git
	cd $GPKG		cd $GPKG
	git checkout --track origin/upstream		git checkout --track origin/upstream -b upstream
	mv .git ../git-safe		mv .git ../git-safe
	cd ..		cd ..
Line 262:		Line 262:
	Now to merge it into the branches		Now to merge it into the branches
	for each mer/* branch		for each mer/* branch
	git checkout --track origin/mer/buttonwidth		git checkout --track origin/mer/buttonwidth -b mer/buttonwidth
	git merge upstream		git merge upstream

	git checkout --track origin/mer/him-arabic		git checkout --track origin/mer/him-arabic -b mer/him-arabic
	git merge upstream		git merge upstream
	This fails:		This fails:
Line 340:		Line 340:

	Carry on:		Carry on:
	git checkout --track origin/mer/keyboard-available		git checkout --track origin/mer/keyboard-available -b mer/keyboard-available
	git merge upstream		git merge upstream

Line 365:		Line 365:

	Finally:		Finally:
	git checkout --track origin/mer/werror		git checkout --track origin/mer/werror -b mer/werror
	Once again we see that the old branch simply wanted to remove -Werror so edit and		Once again we see that the old branch simply wanted to remove -Werror so edit and
	git add configure.ac		git add configure.ac
Line 380:		Line 380:

	Once the conflicting branches are consolidated, they can be merged;		Once the conflicting branches are consolidated, they can be merged;
	git checkout --track origin/master		git checkout --track origin/master -b master
	git merge local		git merge local

	=====HIM-Merge-Branches=====		=====HIM-Merge-Branches=====
	If there were no mer/branches then you would :		If there were no mer/branches then you would :
	git checkout --track origin/master		git checkout --track origin/master -b master
	git merge upstream		git merge upstream

Line 435:		Line 435:
	git clone git@gitorious.org:~lbt/mer/glib2_0-mer.git		git clone git@gitorious.org:~lbt/mer/glib2_0-mer.git
	cd glib2_0-mer/		cd glib2_0-mer/
	git checkout --track origin/upstream		git checkout --track origin/upstream -b upstream
	git rm -r *		git rm -r *

Line 486:		Line 486:

	Now to create a Mer glib from a master		Now to create a Mer glib from a master
	git checkout --track origin/master		git checkout --track origin/master -b master

	Upgrade entire glib		Upgrade entire glib
Line 513:		Line 513:

	And a new Mer release		And a new Mer release
	git checkout --track origin/Mer		git checkout --track origin/Mer -b Mer
	git merge master		git merge master
	editor debian/changelog		editor debian/changelog
Line 543:		Line 543:

	git remote rename origin Upstream		git remote rename origin Upstream
	git branch --track upstream Upstream/master		git branch --track upstream Upstream/master -b master

	Then create a local master (it may be necessary to remove the debian/ directory)		Then create a local master (it may be necessary to remove the debian/ directory)
Line 604:		Line 604:
	Essentially		Essentially
	git clone git@gitorious.org:mer/$GPKG.git		git clone git@gitorious.org:mer/$GPKG.git
	git checkout --track origin/Mer		git checkout --track origin/Mer -b Mer

	determine which feature or branch needs work. Then:		determine which feature or branch needs work. Then:
	git checkout --track origin/mer/<feature>		git checkout --track origin/mer/<feature> -b mer/<feature>

	hack...		hack...
Line 627:		Line 627:
	git checkout --track origin/master -b master		git checkout --track origin/master -b master

	So if you have ~~an older~~ git you need to add the right "-b <branch>" to each of the --track options.		So if you have a newer git you don't need to add the right "-b <branch>" to each of the --track options.

	[[Category:Mer]]		[[Category:Mer]]

imported_>lbt: /* Older Git Versions */

2009-07-29T13:24:05Z

Older Git Versions

← Older revision		Revision as of 13:24, 29 July 2009
Line 626:		Line 626:
	and create the obvious local branch: master. Older gits need to be explicitly told:		and create the obvious local branch: master. Older gits need to be explicitly told:
	git checkout --track origin/master -b master		git checkout --track origin/master -b master

			So if you have an older git you need to add the right "-b <branch>" to each of the --track options.

	[[Category:Mer]]		[[Category:Mer]]

imported_>lbt: clarify

2009-07-28T12:14:55Z

clarify

← Older revision		Revision as of 12:14, 28 July 2009
Line 1:		Line 1:
	== Packaging ==		== Packaging ==
	Note the detailed instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions\|will need tweaks]].		Note that the detailed cut'n'paste instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions\|will need tweaks]] - though they can still be used.

	===Initial Setup===		===Initial Setup===

imported_>lbt: git version and handle no mer/branches

2009-07-28T12:13:17Z

git version and handle no mer/branches

← Older revision		Revision as of 12:13, 28 July 2009
Line 1:		Line 1:
	== Packaging ==		== Packaging ==
	Note the detailed instructions on this page assume a very up-to-date git : 1.6.3.3 even 1.6.0.4 is too old and will need tweaks.		Note the detailed instructions on this page assume a '''very''' up-to-date git : ~1.6.3.x; even 1.6.0.4 is too old and [[#Older Git Versions\|will need tweaks]].

	===Initial Setup===		===Initial Setup===
	The initial Mer DVCS packaging process looks like this:		The initial Mer DVCS packaging process looks like this:
Line 256:		Line 257:
	git tag $UPVER		git tag $UPVER
	pristine-tar commit ../$TARBALL		pristine-tar commit ../$TARBALL

			If there are no mer/* branches then you get to skip to [[#HIM-Merge-Branches]]

	Now to merge it into the branches		Now to merge it into the branches
Line 376:		Line 379:
	git merge mer/werror		git merge mer/werror

	Once the conflicting branches are consolidated, they can be merged:		Once the conflicting branches are consolidated, they can be merged;
	git checkout --track origin/master		git checkout --track origin/master
	git merge local		git merge local

			=====HIM-Merge-Branches=====
			If there were no mer/branches then you would :
			git checkout --track origin/master
			git merge upstream

	And tagged for release:		And tagged for release:
	git add ChangeLog		git add ChangeLog
	git tag 2.1.16-1+0m5-mer1		git tag 2.1.16-1+0m5-mer1

	~~At this point you should look at ../debian if present to decide how it may impact the package branch.~~

	And Mer can be released too:		And Mer can be released too:
	git checkout Mer		git checkout Mer
	git merge master		git merge master

			At this point, if the upstream is a native package, you should look at ../debian if present to decide how it may impact the packaging branch. Otherwise ensure any modified files are added.
	git add debian/changelog debian/control		git add debian/changelog debian/control
	git commit		git commit
Line 612:		Line 620:
	If this works OK then clean up your mer/<feature> branch... probably doing a <code>--squash</code> and push the branch to gitorious.		If this works OK then clean up your mer/<feature> branch... probably doing a <code>--squash</code> and push the branch to gitorious.

			==Older Git Versions==
			Older git versions don't guess -b correctly when using --track.
			Newer git will take:
			git checkout --track origin/master
			and create the obvious local branch: master. Older gits need to be explicitly told:
			git checkout --track origin/master -b master

	[[Category:Mer]]		[[Category:Mer]]

imported_>lbt: /* Packaging */

2009-07-28T11:18:08Z

Packaging

← Older revision		Revision as of 11:18, 28 July 2009
Line 1:		Line 1:
	== Packaging ==		== Packaging ==
			Note the detailed instructions on this page assume a very up-to-date git : 1.6.3.3 even 1.6.0.4 is too old and will need tweaks.
	===Initial Setup===		===Initial Setup===
	The initial Mer DVCS packaging process looks like this:		The initial Mer DVCS packaging process looks like this:

imported_>lbt: git status

2009-07-28T11:00:33Z

git status

← Older revision		Revision as of 11:00, 28 July 2009
Line 248:		Line 248:
	mv debian ../		mv debian ../
	git add .		git add .

			Sanity check to ensure no files are removed etc. If so you need to make sure to <code>git rm</code> them
			git status

	Now we have a clean upstream release		Now we have a clean upstream release

imported_>lbt: rm -rf

2009-07-28T10:51:44Z

rm -rf

← Older revision		Revision as of 10:51, 28 July 2009
Line 235:		Line 235:
	mv .git ../git-safe		mv .git ../git-safe
	cd ..		cd ..
	rm -r $GPKG		rm -rf $GPKG

	replace the upstream code		replace the upstream code

imported_>lbt: correct typo

2009-07-28T10:39:21Z

correct typo

← Older revision		Revision as of 10:39, 28 July 2009
Line 235:		Line 235:
	mv .git ../git-safe		mv .git ../git-safe
	cd ..		cd ..
	~~git~~ rm -r $GPKG		rm -r $GPKG

	replace the upstream code		replace the upstream code