|
Hi, John asked if those users that have modified repositories could do some tests for us. <quote> I would say that to give us feedback on whether this will work, and what kinds of trouble users may face, ask people to do the following: 1. Make sure all your changes/local values are committed 2. Make an entire copy of an existing git clone of LSMB they use in production, especially any containing modified code 3. In the copy, edit the .git/config file, and under [remote "origin"] (or whatever remote they have set up for our main git repo) change: url = "" class="moz-txt-link-abbreviated" href="mailto:..hidden..:ledgersmb/LedgerSMB.git">..hidden..:ledgersmb/LedgerSMB.git -- or -- url = "" class="moz-txt-link-freetext" href="https://github.com/ledgersmb/LedgerSMB.git">https://github.com/ledgersmb/LedgerSMB.git ... to ... url ="" moz-do-not-send="true" class="moz-txt-link-freetext" href="https://github.com/sbts/lsmb-test-shrunk.git"> https://github.com/sbts/lsmb-test-shrunk.git 4. ... and then attempt to update using their normal process (git fetch origin; git merge origin/1.4 is what I typically do) 5. Let us know if this works, or if it all blows up! For cleanup of failed merges, here are some things to try: * git merge --abort * git rebase --abort * git reset --hard HEAD * git clean -df (try with -nd first to make sure you don't destroy unexpected files) Merge strategies to test: * git merge origin/1.4 (or master) - for me, a bunch of merge conflicts * git rebase origin/1.4 - for me, a bunch of merge conflicts * git merge -s theirs origin/1.4 (not available in older git versions, but should do the right thing if you have no patches to core files, only new additions) ... if none of those work, two other alternatives to try: a. Merge with strategy "ours." If you have local modifications, find the last commit that you merged in from the LedgerSMB master, and use "git log origin/1.4" (or master) to identify the new commit id. For example, I see the last commit before I merged is in the new branch as 23dcc024d. You should then be able to: git merge -s ours 23dcc024d # this puts all the commits up to this point into your history, without changing anything in the working copy git merge origin/1.4 # this gets you the rest of the way up to date b. Manually resolve merge conflicts. For each unmerged path, unless you know you have a local change, you should be able to grab the new version from the new upstream and add it to the index. For my copy, this looks like it will do it: git checkout origin/1.4 LedgerSMB UI Locale utils git commit Cheers, John Locke Sign up for News and Drupal updates from Freelock! </quote>On 31/12/15 22:50, David G wrote:
Hi everyone, |
------------------------------------------------------------------------------
_______________________________________________ Ledger-smb-devel mailing list ..hidden.. https://lists.sourceforge.net/lists/listinfo/ledger-smb-devel