Chris Koeritz [Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)]
Merge branch 'release-2.140.92'
bringing in release code for 2.140.92.
this marks a fairly painful learning process for git branches, but it seems like things have stabilized now.
Chris Koeritz [Fri, 10 Nov 2017 22:48:38 +0000 (17:48 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
updated local master
Chris Koeritz [Fri, 10 Nov 2017 22:34:30 +0000 (17:34 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
updates from dev branch
Chris Koeritz [Fri, 10 Nov 2017 22:31:55 +0000 (17:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
get our own mods from dev
Chris Koeritz [Fri, 10 Nov 2017 22:31:36 +0000 (17:31 -0500)]
nearly fixed the downstream pushing
Chris Koeritz [Fri, 10 Nov 2017 22:31:36 +0000 (17:31 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 22:29:10 +0000 (22:29 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:29:01 +0000 (22:29 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:28:57 +0000 (22:28 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:27:36 +0000 (22:27 +0000)]
Merge github.com:fredhamster/feisty_meow
funkistan
Chris Koeritz [Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
getting latest from dev
Chris Koeritz [Fri, 10 Nov 2017 22:19:15 +0000 (17:19 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
remerge
Chris Koeritz [Fri, 10 Nov 2017 22:18:45 +0000 (17:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
merging release
Chris Koeritz [Fri, 10 Nov 2017 22:18:30 +0000 (17:18 -0500)]
Merge branch 'release-2.140.92' into dev
getting latest from release into dev
Chris Koeritz [Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
fluffing issues
Chris Koeritz [Fri, 10 Nov 2017 22:14:47 +0000 (17:14 -0500)]
added back in build version header.
Chris Koeritz [Fri, 10 Nov 2017 21:28:39 +0000 (16:28 -0500)]
new script for careful git update
rfluffer will do the careful git update on repositories.
also experimenting with the branch state method during our pulls to see what it actually reports.
Chris Koeritz [Fri, 10 Nov 2017 21:28:39 +0000 (16:28 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
Chris Koeritz [Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)]
Merge branch 'release-2.140.92' into dev
getting fixes from release branch into dev branch
Chris Koeritz [Fri, 10 Nov 2017 21:09:24 +0000 (21:09 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 21:08:52 +0000 (16:08 -0500)]
mod to check if remote branch exists
Chris Koeritz [Fri, 10 Nov 2017 21:01:26 +0000 (16:01 -0500)]
updated version
starting up next release.
Chris Koeritz [Fri, 10 Nov 2017 20:48:51 +0000 (15:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
grabbing dev mainline
Chris Koeritz [Fri, 10 Nov 2017 20:48:35 +0000 (20:48 +0000)]
added all subfolders to make
Chris Koeritz [Fri, 10 Nov 2017 20:48:35 +0000 (20:48 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:37:39 +0000 (15:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
merging in mainline
Chris Koeritz [Fri, 10 Nov 2017 20:37:38 +0000 (15:37 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:37:12 +0000 (15:37 -0500)]
new readme
Chris Koeritz [Fri, 10 Nov 2017 20:35:27 +0000 (15:35 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 20:34:43 +0000 (20:34 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:34:04 +0000 (15:34 -0500)]
missed the step i knew i needed
Chris Koeritz [Fri, 10 Nov 2017 20:33:10 +0000 (15:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
mergings
Chris Koeritz [Fri, 10 Nov 2017 20:32:21 +0000 (15:32 -0500)]
maybe the right implem
needed to do our careful update first. lots of still untested stuff that needs to work, so let's see.
Chris Koeritz [Fri, 10 Nov 2017 20:27:59 +0000 (20:27 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:26:56 +0000 (15:26 -0500)]
pseudocode
Chris Koeritz [Fri, 10 Nov 2017 20:26:56 +0000 (15:26 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:25:49 +0000 (20:25 +0000)]
detweaked
Chris Koeritz [Fri, 10 Nov 2017 20:21:52 +0000 (15:21 -0500)]
added a pull on origin
had explicity omitted this before, but it's actually needed.
Chris Koeritz [Fri, 10 Nov 2017 20:17:26 +0000 (15:17 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
hmmm, missing this step in scripts
Chris Koeritz [Fri, 10 Nov 2017 20:16:44 +0000 (15:16 -0500)]
another try at the totally right steps
Chris Koeritz [Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
grabbing the latest from dev
Chris Koeritz [Fri, 10 Nov 2017 20:13:57 +0000 (15:13 -0500)]
dropping probably useless step
Chris Koeritz [Fri, 10 Nov 2017 20:13:57 +0000 (15:13 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:07:25 +0000 (20:07 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 20:05:52 +0000 (20:05 +0000)]
this script needs help
needs to be adapted to our new careful update method.
Chris Koeritz [Fri, 10 Nov 2017 19:48:03 +0000 (14:48 -0500)]
now reports if nothing was done for rev ctrl
Chris Koeritz [Fri, 10 Nov 2017 19:39:26 +0000 (14:39 -0500)]
now complains about attempts to do nothing
Chris Koeritz [Fri, 10 Nov 2017 19:33:43 +0000 (14:33 -0500)]
Merge branch 'release-2.140.91' into dev
bringing in latest release
Chris Koeritz [Fri, 10 Nov 2017 19:31:15 +0000 (14:31 -0500)]
Merge branch 'release-2.140.91'
getting latest into master
Chris Koeritz [Fri, 10 Nov 2017 19:29:08 +0000 (14:29 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91
getting things snacky
Chris Koeritz [Fri, 10 Nov 2017 19:26:26 +0000 (14:26 -0500)]
getting things right still
also inadvertently included the version number in our dev branch from what was going to be the release branch.
Chris Koeritz [Fri, 10 Nov 2017 19:15:22 +0000 (14:15 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 19:13:45 +0000 (14:13 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
mergets
Chris Koeritz [Fri, 10 Nov 2017 19:13:43 +0000 (14:13 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 19:12:48 +0000 (14:12 -0500)]
tweak 6
Chris Koeritz [Fri, 10 Nov 2017 19:12:48 +0000 (14:12 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 18:56:53 +0000 (13:56 -0500)]
more cleanups
Chris Koeritz [Fri, 10 Nov 2017 18:56:53 +0000 (13:56 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 18:44:57 +0000 (13:44 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
maybe working with the remote handling
Chris Koeritz [Fri, 10 Nov 2017 18:44:51 +0000 (13:44 -0500)]
cleaning
Chris Koeritz [Fri, 10 Nov 2017 18:44:51 +0000 (13:44 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 18:44:37 +0000 (13:44 -0500)]
tweak 5
Chris Koeritz [Fri, 10 Nov 2017 18:44:37 +0000 (13:44 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 18:40:51 +0000 (13:40 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
mergey marge
Chris Koeritz [Fri, 10 Nov 2017 18:40:24 +0000 (13:40 -0500)]
first attempt to use careful code
let's see how it works in the very case that's been vexing me?
Chris Koeritz [Fri, 10 Nov 2017 18:40:24 +0000 (13:40 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 18:38:45 +0000 (13:38 -0500)]
tweak 4
Chris Koeritz [Fri, 10 Nov 2017 18:38:45 +0000 (13:38 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 18:37:32 +0000 (13:37 -0500)]
hoping this is the right deal now
Chris Koeritz [Fri, 10 Nov 2017 18:33:53 +0000 (13:33 -0500)]
changes to make careful update only for push
we don't generally want a regular update to get stuff from just everywhere; we want it to update if there's stuff on our specific remote origin. so this only does the multi branch cleanup process when we're about to push changes, since that's when we'll get boned if the remotes aren't right.
Chris Koeritz [Fri, 10 Nov 2017 18:26:27 +0000 (13:26 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
farp
Chris Koeritz [Fri, 10 Nov 2017 18:22:23 +0000 (13:22 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
wtf
Chris Koeritz [Fri, 10 Nov 2017 18:21:59 +0000 (13:21 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
merging from master
Chris Koeritz [Fri, 10 Nov 2017 18:21:44 +0000 (13:21 -0500)]
tweak3
Chris Koeritz [Fri, 10 Nov 2017 18:20:56 +0000 (13:20 -0500)]
slugworth
Chris Koeritz [Fri, 10 Nov 2017 18:03:50 +0000 (13:03 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
pulling in master changes
Chris Koeritz [Fri, 10 Nov 2017 18:03:36 +0000 (13:03 -0500)]
tweak 2
Chris Koeritz [Fri, 10 Nov 2017 18:02:20 +0000 (13:02 -0500)]
fixed diagnostic message
Chris Koeritz [Fri, 10 Nov 2017 18:00:19 +0000 (13:00 -0500)]
better comments
Chris Koeritz [Fri, 10 Nov 2017 17:56:43 +0000 (12:56 -0500)]
updating toward goodness
Chris Koeritz [Fri, 10 Nov 2017 17:51:06 +0000 (12:51 -0500)]
enabling pulls again in dev branch
Chris Koeritz [Fri, 10 Nov 2017 17:48:23 +0000 (12:48 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
fubar borkistan
Chris Koeritz [Fri, 10 Nov 2017 17:27:40 +0000 (12:27 -0500)]
nice, got script to wait for gvim
Chris Koeritz [Fri, 10 Nov 2017 17:02:54 +0000 (17:02 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
funkytown lives
Chris Koeritz [Fri, 10 Nov 2017 16:29:15 +0000 (11:29 -0500)]
moving to a better name
i wanted a development branch instead of one called "develop", but now that i've been using the names a lot, development is too (*& long. but develop bugs me. so, to go even more compact, i've chosen dev as the real development branch. the one called development will wither and die.
Chris Koeritz [Fri, 10 Nov 2017 16:15:28 +0000 (11:15 -0500)]
arghsomeness
Chris Koeritz [Fri, 10 Nov 2017 16:03:17 +0000 (11:03 -0500)]
back to the chaos factory
this is the scrambled up version still in progress, and it's totally appropriate to the development branch, given that no one else is seeing that branch yet.
Chris Koeritz [Fri, 10 Nov 2017 15:22:47 +0000 (10:22 -0500)]
Merge branch 'master' into development
sucking in things from master branch
Fred T. Hamster [Fri, 10 Nov 2017 15:18:52 +0000 (10:18 -0500)]
don't commit with no mods
one improvement over classic, and necessary since we're always checking return values now.
Fred T. Hamster [Fri, 10 Nov 2017 15:00:10 +0000 (10:00 -0500)]
tweak1
Chris Koeritz [Fri, 10 Nov 2017 14:51:42 +0000 (09:51 -0500)]
Merge branch 'release-2.140.90' into development
bringing release back into dev
Chris Koeritz [Fri, 10 Nov 2017 14:49:53 +0000 (09:49 -0500)]
Merge branch 'release-2.140.90'
bringing in release to flush intermediate versions of git pull
Chris Koeritz [Fri, 10 Nov 2017 14:49:15 +0000 (09:49 -0500)]
updated version
Chris Koeritz [Fri, 10 Nov 2017 14:48:53 +0000 (09:48 -0500)]
classic version redeployed
Chris Koeritz [Fri, 10 Nov 2017 14:47:26 +0000 (09:47 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into release-2.140.90
fark
Chris Koeritz [Fri, 10 Nov 2017 14:30:40 +0000 (09:30 -0500)]
vanilla time
going back to simplest thing, since master branch unfortunately got half baked version of pull process.
Fred T. Hamster [Fri, 10 Nov 2017 14:19:39 +0000 (09:19 -0500)]
giving the vnc lab its own folder
Chris Koeritz [Fri, 10 Nov 2017 14:16:25 +0000 (09:16 -0500)]
working through git slowly
added code to check if branches have diverged
Fred T. Hamster [Fri, 10 Nov 2017 14:08:03 +0000 (09:08 -0500)]
back to square one
rebuilding the git pull process from scratch, since the simplistic approach we had enjoyed so well for so long totally doesn't work with branches, and our new fangled cobbled together version from across the internet isn't right either. need to build reliable pieces one at a time.
projects / feisty_meow.git / log