[Ohrrpgce] SVN: teeemcee/7703 email_save_to_developer, only works on Android. Requires 770bfd5 of sdl-

James Paige Bob at HamsterRepublic.com
Tue Feb 2 09:01:40 PST 2016 

Okay, I'll wait to merge,

For myself, this is how I am using my branches.

Anytime I want to change something, I make a branch from sdl_android

Then I finish the work on the branch, then I merge it back into sdl_android

Then I merge sdl_android into ohrrpgce

multiple branches has never been a point of confusion for me because I
normally never work on more than one at a time.

If I don't merge a branch before I start the next one, then I would treat
that first branch as dead, and probably never merge it. (I think I have
already deleted a few branches that fit that description)

---
James



On Tue, Feb 2, 2016 at 8:16 AM, Ralph Versteegen <teeemcee at gmail.com> wrote:

> Oh, I had totally forgotten that you were keeping OHR-specific changes
> separate. Yes, I guess I could split things up in the same way. I will have
> to rewrite the history of my branches though, so don't pull from them for a
> moment.
>
> If the pull complained about conflicts, then it didn't complete and you
> can do just "git merge --abort" However I think there probably were no
> conflicts, so you would have to use reset --hard <ref>.
>
> Having lots of branches is only a problem because it makes it unobvious to
> someone else (or yourself, if you've forgotten) what you're actually
> working on. I have a couple dozen branches in my OHR repo because I
> actually have that many different half-finished features not checked in!
> And I find that makes it difficult to remember what all the branches are.
> You're using a different branch for every couple of commits and then doing
> merges, which isn't really great even if you delete the branches
> afterwards, because of the large numbers of unintersting merge commit.
> Normal practice is to either merge less frequently, or rebase branches so
> that history becomes (more) linear. Of course messy merges is often
> unavoidable; I've been browsing the linux repo lately to follow btrfs
> development, and it's an incomprehensibly vast sea of merges despite Linus
> yelling at anyone who does unnecessary branches and merges. Generally work
> on one kernel subproject/system will only get merged with the rest for
> release candidates or when otherwise necessary, though there's also lots of
> branching and merging within each project.
>
> On 3 February 2016 at 04:45, James Paige <Bob at hamsterrepublic.com> wrote:
>
>> On Mon, Feb 1, 2016 at 11:20 PM, Ralph Versteegen <teeemcee at gmail.com>
>> wrote:
>>
>>> First, do "git remote -v" in the git repo to find out what name you've
>>> assigned to my repository. It will probably be "origin" if you cloned my
>>> repository in the first place. Then do "git pull <remotename> ohrrpgce" to
>>> fetch my changes and merge into yours (actually fast forward in this case
>>> where there seems to be nothing to merge).
>>>
>>
>> Okay. I cloned from yours to my own github account, and the cloned my
>> local copy from there (and apparently I manually added pelya's later)
>>
>> james at ghostorchid:~/src/misc/sdl-android$ git remote -v
>> origin    https://github.com/bob-the-hamster/commandergenius.git (fetch)
>> origin    https://github.com/bob-the-hamster/commandergenius.git (push)
>> pelya    https://github.com/pelya/commandergenius.git (fetch)
>> pelya    https://github.com/pelya/commandergenius.git (push)
>> upstream    git://github.com/rversteegen/commandergenius.git (fetch)
>> upstream    git://github.com/rversteegen/commandergenius.git (push)
>>
>> I can also see that your changes exist on your ohrrpgce but not your
>> sdl_android branch
>>
>> In my own tree, I do all important edits on the sdl_android branch. My
>> ohrrpgce branch is very strictly limited to only the following chages:
>>
>> * replaced splash screen
>> * replaced default button images
>> * removed non-ohrrpgce projects
>>
>> So I think that means for my purposes I want to do:
>>
>>   git checkout sdl_android
>>   git pull upstream ohrrpgce
>>   git checkout ohrrpgce
>>   git merge sdl_android
>>
>> ...wish me luck!
>>
>> ...and crap.
>>
>> It looks like your ohrrpgce branch is based on my ohrrpgce branch, with
>> the splash and button images replaced, and all thenon-ohrrpgce projects
>> removed.
>>
>> That means that:
>>
>>   git checkout sdl_android
>>   git pull upstream ohrrpgce
>>
>> And now I have a horribly mangled local sdl_android branch... I need to
>> figure out how to undo that :(
>>
>> (after a bit of mucking about, I *think* that "git reset --hard e22ba68"
>> did the trick... I think...)
>>
>>
>> BTW, in git you would normally delete a branch after merging it into
>>> another (git branch -d <name>), otherwise you end up with mountains of
>>> historical branches as you have. So the name of the branch only gets
>>> recorded (by default) in the commit message for the merge commit. On the
>>> other hand in hg every commit permanently records the name of the branches
>>> it was part of. The hg equivalent of a branch in git is actually called a
>>> bookmark.
>>>
>>
>> Why is it good to delete branches? How is having a lot of old historical
>> ones a problem?
>>
>>
>>> However, it looks like I'll have to make futher changes to the java code.
>>>
>>
>> For now I'll just test the Android debug=0 thing using svn revision 7702
>>
>> ---
>> James
>>
>>
>>>
>>>
>>> On 2 February 2016 at 04:19, James Paige <Bob at hamsterrepublic.com>
>>> wrote:
>>>
>>>> I was going to test the fixes to the battle stack on Android, but I can
>>>> no longer compile the android port. I assume this is because "Requires
>>>> 770bfd5 of sdl-android" but I only just barely understand what that means.
>>>>
>>>> I am guessing that 770bfd5 identifies a commit in your git tree for
>>>> sdl-android.
>>>>
>>>> I searched around on your guthub page and found it here:
>>>> https://github.com/rversteegen/commandergenius/commits/ohrrpgce
>>>>
>>>> ...Although I have no idea how to merge it into my own tree
>>>>
>>>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>>>> warning: hidden symbol '__cxa_begin_cleanup' in
>>>> ./obj/local/armeabi/libgnustl_static.a(eh_arm.o) is referenced by DSO
>>>> ./obj/local/armeabi/libsdl-1.2.so
>>>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>>>> warning: hidden symbol '__cxa_type_match' in
>>>> ./obj/local/armeabi/libgnustl_static.a(eh_arm.o) is referenced by DSO
>>>> ./obj/local/armeabi/libsdl-1.2.so
>>>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>>>> ./obj/local/armeabi/objs-debug/application/ohrrpgce/tmp/game-allmodex.o: in
>>>> function
>>>> EMAIL_FILES:jni/../jni/application/ohrrpgce/tmp/game-allmodex.c:12918:
>>>> error: undefined reference to 'SDL_ANDROID_EmailFiles'
>>>> collect2: ld returned 1 exit status
>>>> make: *** [obj/local/armeabi/libapplication.so] Error 1
>>>>
>>>>
>>>>
>>>>
>>>> On Mon, Feb 1, 2016 at 4:35 AM, <subversion at hamsterrepublic.com> wrote:
>>>>
>>>>> teeemcee
>>>>> 2016-02-01 04:35:06 -0800 (Mon, 01 Feb 2016)
>>>>> 455
>>>>> email_save_to_developer, only works on Android. Requires 770bfd5 of
>>>>> sdl-android
>>>>>
>>>>> This emails an rsav file and g_debug.txt. Not sure it actually works;
>>>>> it worked
>>>>> until I modified the java function to accept more than one file, and
>>>>> then gmail
>>>>> started crashing and the usb link to my phone stopped working.
>>>>>
>>>>> Added an option to the F8 debug menu to email the save, but of course
>>>>> you can't
>>>>> press F8 on a phone, and the option doesn't appear on other platforms.
>>>>> ---
>>>>> U   wip/allmodex.bas
>>>>> U   wip/allmodex.bi
>>>>> U   wip/game.bas
>>>>> U   wip/game.bi
>>>>> U   wip/gglobals.bi
>>>>> U   wip/savegame.rbas
>>>>> U   wip/testgame/autotest.rpg
>>>>> _______________________________________________
>>>>> Ohrrpgce mailing list
>>>>> ohrrpgce at lists.motherhamster.org
>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> Ohrrpgce mailing list
>>>> ohrrpgce at lists.motherhamster.org
>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>
>>>>
>>>
>>> _______________________________________________
>>> Ohrrpgce mailing list
>>> ohrrpgce at lists.motherhamster.org
>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>
>>>
>>
>> _______________________________________________
>> Ohrrpgce mailing list
>> ohrrpgce at lists.motherhamster.org
>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>
>>
>
> _______________________________________________
> Ohrrpgce mailing list
> ohrrpgce at lists.motherhamster.org
> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.motherhamster.org/pipermail/ohrrpgce-motherhamster.org/attachments/20160202/ff9c9aa1/attachment-0001.htm>

More information about the Ohrrpgce mailing list