<div dir="ltr"><div><div>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.<br><br></div>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>. <br><br></div>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.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On 3 February 2016 at 04:45, James Paige <span dir="ltr"><<a href="mailto:Bob@hamsterrepublic.com" target="_blank">Bob@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span class="">On Mon, Feb 1, 2016 at 11:20 PM, Ralph Versteegen <span dir="ltr"><<a href="mailto:teeemcee@gmail.com" target="_blank">teeemcee@gmail.com</a>></span> wrote:<br></span><div class="gmail_extra"><div class="gmail_quote"><span class=""><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div>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).<br></div></div></div></blockquote><div><br></div></span><div>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)<br></div><div><br>james@ghostorchid:~/src/misc/sdl-android$ git remote -v<br>origin <a href="https://github.com/bob-the-hamster/commandergenius.git" target="_blank">https://github.com/bob-the-hamster/commandergenius.git</a> (fetch)<br>origin <a href="https://github.com/bob-the-hamster/commandergenius.git" target="_blank">https://github.com/bob-the-hamster/commandergenius.git</a> (push)<br>pelya <a href="https://github.com/pelya/commandergenius.git" target="_blank">https://github.com/pelya/commandergenius.git</a> (fetch)<br>pelya <a href="https://github.com/pelya/commandergenius.git" target="_blank">https://github.com/pelya/commandergenius.git</a> (push)<br>upstream git://<a href="http://github.com/rversteegen/commandergenius.git" target="_blank">github.com/rversteegen/commandergenius.git</a> (fetch)<br>upstream git://<a href="http://github.com/rversteegen/commandergenius.git" target="_blank">github.com/rversteegen/commandergenius.git</a> (push)<br><br></div><div>I can also see that your changes exist on your ohrrpgce but not your sdl_android branch<br><br></div><div>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:<br><br></div><div>* replaced splash screen<br></div><div>* replaced default button images<br></div><div>* removed non-ohrrpgce projects<br></div><div><br></div><div>So I think that means for my purposes I want to do:<br><br></div><div> git checkout sdl_android<br></div><div> git pull upstream ohrrpgce<br></div> git checkout ohrrpgce<br><div> git merge sdl_android<br></div><br></div><div class="gmail_quote">...wish me luck!<br></div><div class="gmail_quote"><div><br></div><div>...and crap.<br><br></div><div>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.<br><br></div><div>That means that:<br><br> git checkout sdl_android<br> git pull upstream ohrrpgce<br></div><div> <br></div><div>And now I have a horribly mangled local sdl_android branch... I need to figure out how to undo that :(<br><br>(after a bit of mucking about, I *think* that "git reset --hard e22ba68" did the trick... I think...)<br><br><br></div><span class=""><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div></div>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.<br></div></div></blockquote><div><br></div></span><div>Why is it good to delete branches? How is having a lot of old historical ones a problem?<br></div><span class=""><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div>However, it looks like I'll have to make futher changes to the java code.</div></blockquote><div><br></div></span><div>For now I'll just test the Android debug=0 thing using svn revision 7702<br></div><div><br>---<br></div><div>James<br></div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div><br><div><div class="gmail_extra"><br><div class="gmail_quote">On 2 February 2016 at 04:19, James Paige <span dir="ltr"><<a href="mailto:Bob@hamsterrepublic.com" target="_blank">Bob@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div><div>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.<br><br></div>I am guessing that 770bfd5 identifies a commit in your git tree for sdl-android.<br><br></div>I searched around on your guthub page and found it here: <a href="https://github.com/rversteegen/commandergenius/commits/ohrrpgce" target="_blank">https://github.com/rversteegen/commandergenius/commits/ohrrpgce</a><br><br></div>...Although I have no idea how to merge it into my own tree<br><div><div><div><br>/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/<a href="http://libsdl-1.2.so" target="_blank">libsdl-1.2.so</a><br>/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/<a href="http://libsdl-1.2.so" target="_blank">libsdl-1.2.so</a><br>/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'<br>collect2: ld returned 1 exit status<br>make: *** [obj/local/armeabi/libapplication.so] Error 1<br><br><br><br></div></div></div></div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Feb 1, 2016 at 4:35 AM, <span dir="ltr"><<a href="mailto:subversion@hamsterrepublic.com" target="_blank">subversion@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">teeemcee<br>
2016-02-01 04:35:06 -0800 (Mon, 01 Feb 2016)<br>
455<br>
email_save_to_developer, only works on Android. Requires 770bfd5 of sdl-android<br>
<br>
This emails an rsav file and g_debug.txt. Not sure it actually works; it worked<br>
until I modified the java function to accept more than one file, and then gmail<br>
started crashing and the usb link to my phone stopped working.<br>
<br>
Added an option to the F8 debug menu to email the save, but of course you can't<br>
press F8 on a phone, and the option doesn't appear on other platforms.<br>
---<br>
U wip/allmodex.bas<br>
U wip/<a href="http://allmodex.bi" rel="noreferrer" target="_blank">allmodex.bi</a><br>
U wip/game.bas<br>
U wip/<a href="http://game.bi" rel="noreferrer" target="_blank">game.bi</a><br>
U wip/<a href="http://gglobals.bi" rel="noreferrer" target="_blank">gglobals.bi</a><br>
U wip/savegame.rbas<br>
U wip/testgame/autotest.rpg<br>
_______________________________________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.org</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org</a><br>
</blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.org</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org</a><br>
<br></blockquote></div><br></div></div></div></div></div>
<br>_______________________________________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.org</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org</a><br>
<br></blockquote></div></div></div><br></div></div>
<br>_______________________________________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org">ohrrpgce@lists.motherhamster.org</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org</a><br>
<br></blockquote></div><br></div>