81 Commits

Author	SHA1	Message	Date
Rudolf Polzer	d96a84b1b3	more admin-merge-2 stuff ;)	2010-05-15 22:24:38 +02:00
Rudolf Polzer	0df1d199c8	some fixes for ./all admin-merge-2	2010-05-15 20:11:23 +02:00
Rudolf Polzer	8469bee7c0	build watermark too	2010-05-14 20:29:58 +02:00
Rudolf Polzer	01ac8add25	./all run: use pulseaudio if present	2010-05-10 21:16:23 +02:00
Rudolf Polzer	84d30a1eb1	work around the bug Chryyz got	2010-05-10 08:39:45 +02:00
Rudolf Polzer	c45ae11217	admin-merge-2 attempt	2010-05-09 19:53:34 +02:00
Rudolf Polzer	55bbcbfc9e	"all": new command ./all update -N (only gets NEW repos), and let ./all each continue on "cd" error	2010-05-09 15:46:17 +02:00
Rudolf Polzer	a43bab8422	try forcing the mingw target on win32	2010-05-08 20:54:22 +02:00
Rudolf Polzer	f6a5811614	move mediasource out to an extra repo	2010-05-08 18:45:50 +02:00
Rudolf Polzer	21a4047395	adminmerge real fix ;)	2010-05-08 14:50:05 +02:00
Rudolf Polzer	ff786842ab	make adminmerge more covnenient	2010-05-08 14:49:01 +02:00
Rudolf Polzer	7ef2094c74	try setting DYLD_LIBRARY_PATH for OSX	2010-05-07 09:40:03 +02:00
Rudolf Polzer	7bb1263341	new all function: ./all -c compile, does "make clean" too	2010-05-06 20:16:46 +02:00
Rudolf Polzer	ed7a928da7	small change to ./all, not done yet (command branches_short)	2010-05-04 07:31:37 +02:00
Rudolf Polzer	2493ceb76c	all script: use div0-stable branch for DP	2010-05-02 13:06:36 +02:00
Rudolf Polzer	a0e309ae13	try to handle the case if the branch has been remotely deleted in "push"	2010-04-28 16:30:51 +02:00
Rudolf Polzer	8f10e29d65	Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic	2010-04-26 22:48:32 +02:00
Rudolf Polzer	c53177ca96	targets targets targets targets ;) ./all compile wgl	2010-04-26 22:48:14 +02:00
Rudolf Polzer	2498e2b602	try helping windoze in finding the DLLs	2010-04-26 15:34:12 +02:00
Rudolf Polzer	169208535f	Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic	2010-04-26 14:11:23 +02:00
Rudolf Polzer	474bca19f8	pk3dir handling: detect if the matching pk3 file exists, and then ignore the repo for the purpose of this script	2010-04-26 14:10:54 +02:00
Rudolf Polzer	740a38b25a	Merge branch 'master' of ssh://git.xonotic.org/xonotic	2010-04-26 11:10:20 +02:00
Rudolf Polzer	ef35235811	./all: allow the branch command even if the branch already exists, skip the repos in which it does	2010-04-26 11:10:04 +02:00
Rudolf Polzer	27fd916063	don't abort completely if git pull gitake'd	2010-04-25 22:22:19 +02:00
Rudolf Polzer	27afc09631	workaround for windows to not compile the SDL binary, and default to WGL	2010-04-25 20:21:54 +02:00
Rudolf Polzer	a91e33f94e	fix typo	2010-04-22 21:29:50 +02:00
Rudolf Polzer	d668294124	also a test compile step now :P	2010-04-22 20:40:40 +02:00
Rudolf Polzer	ebd8334087	admin-merge: also do a test compile ;)	2010-04-22 20:38:44 +02:00
Rudolf Polzer	43ddbc8816	./all: new admin-merge command to review and merge a branch	2010-04-22 15:56:16 +02:00
Rudolf Polzer	991fbce191	.gitattributes file	2010-04-17 20:47:12 +02:00
Rudolf Polzer	081cbbd21e	./all push -s ... submits the current branches to the repo as finished, to-be-merged, branches	2010-04-16 19:41:05 +02:00
Rudolf Polzer	0f21e25d2b	fix a minor bug in ./all push	2010-04-16 19:36:41 +02:00
Rudolf Polzer	3413c77de6	set autocrlf and safecrlf in all repos automatically	2010-04-16 19:12:40 +02:00
Rudolf Polzer	5065d94791	let's allow the forcing in git-fetch again, as we WANT to allow rebasing in /rebase/ branches	2010-04-16 19:09:06 +02:00
xonotic	0a079af166	correctly write info.txt	2010-04-15 11:43:40 +02:00
xonotic	9c65237846	new save/restore branches commands	2010-04-15 11:43:40 +02:00
Rudolf Polzer	2a8628fbe7	add "commit" as alias to push in the ./all script	2010-04-11 21:09:32 +02:00
Rudolf Polzer	4ece547f4f	add another uname prefix to detect Windows (seen that somewhere)	2010-04-11 12:23:32 +02:00
Rudolf Polzer	f5bb6ca678	./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)	2010-04-10 18:05:46 +02:00
Rudolf Polzer	2e2d41c6ba	"branch" command: always branch off master, not off HEAD, unless a branch is specified	2010-04-05 13:48:23 +02:00
Rudolf Polzer	3db1a93510	REALLY fix that :P	2010-04-02 23:14:58 +02:00
Rudolf Polzer	2afddf0041	fix call to checkself	2010-04-02 23:14:05 +02:00
Rudolf Polzer	7750b15f0a	better show the name of "."	2010-04-02 21:25:08 +02:00
Rudolf Polzer	592d77dbf0	better handling of merge conflicts	2010-04-02 21:11:17 +02:00
Rudolf Polzer	a93d716530	new feature: "./all merge" - merges changes from master into your branches (to be done after update)	2010-04-02 20:49:48 +02:00
Rudolf Polzer	e68fe4a5ac	detect not having cksum, and prefer md5sum	2010-04-02 20:43:07 +02:00
Rudolf Polzer	7e8af582d1	Make it look nicer, but do the same ;)	2010-04-02 20:35:19 +02:00
Rudolf Polzer	a6f6301818	Workaround for Win32 to prevent self-nuking.	2010-04-02 20:34:05 +02:00
Rudolf Polzer	3dca7f8211	SOme fixes for ../../all	2010-04-02 20:14:19 +02:00
Rudolf Polzer	db1393bf33	Detect calling "all" via e.g. ../../all and chdir where it SHOULD be	2010-04-02 20:12:36 +02:00