Upgrade 13.0.3 to 13.0.4 using git checkout

Maintaining my Dolibarr
, ,
1

Hi,
I’m trying to upgrade from ver 13.0.3 to 13.0.4.
As the install was done using git clone, so I’m doing git checkout as per instruction in wiki: git checkout -b 13.0.4 --depth 1. However this doesn’t work, with error unknown option ‘depth’.

Running the command without --depth option seems to work: git checkout -b 13.0.4. Then after it finish I went to /htdocs/install on browser, however it didn’t show any option for 13.0.4?

Latest version upgrade: 13.0.3 - Version program: 13.0.3

Anyone can point out what I’ve missed please?

2

Hi,

There isn’t a new branch for each minor version of Dolibarr, so the branch for 13.0.4 is named 13.0.

If you are already on branch 13.0 (you can check it with a simple git branch command: the current branch has a * in front of its name), just run

git pull origin 13.0

(I assume the remote “origin” is pointing to git@github.com:Dolibarr/dolibarr).

If you are not on branch 13.0, you can run git checkout 13.0 first.

2 Likes
3

Hi fmortgat,

Thank you for your explanation! It worked and clear my misunderstanding of git :smiley:
I hope the wiki instruction Installation - Upgrade - Dolibarr ERP CRM Wiki can be updated for better understanding, perhaps?

Cheers and thanks again!

4

Hi,

Wiki is open to all contributions, so you can make the changes that you think necessary

1 Like
7

I updated the git checkout on the wiki. I think the --depth parameter is useful for the git clone command for end users (it stops git from downloading the whole history of the project), but it doesn’t seem to exist for git checkout (it wouldn’t make much sense imho).

8

Hi ksar,
Unfortunately I don’t have confidence yet in editing the wiki since I just get my head wrapped around git :wink: but I’ll try in the future.

Cheers

9

Awesome, thanks fmorgat!
That’ll be usefull for many.

Cheers

10

Hi,
Anybody can help with upgrading from 13.0.4 to 14.0.4 using git please?
I tried git pull origin 14.0 but got this error:

[~/public_html/dolibarr]# git pull origin 14.0

  • branch 14.0 → FETCH_HEAD
    Updating 87a66c7bf0…49e3344a58
    error: Your local changes to the following files would be overwritten by merge:
    build/debian/control
    build/generate_filelist_xml.php
    build/rpm/dolibarr_fedora.spec
    build/rpm/dolibarr_generic.spec
    build/rpm/dolibarr_mandriva.spec
    build/rpm/dolibarr_opensuse.spec
    dev/examples/code/create_invoice.php
    dev/examples/code/create_order.php
    dev/examples/code/create_product.php
    dev/examples/code/create_user.php
    dev/examples/code/get_contracts.php
    dev/initdata/generate-invoice.php
    dev/initdata/generate-order.php
    dev/initdata/generate-product.php
    dev/initdata/generate-proposal.php
    dev/initdata/generate-thirdparty.php
    dev/initdata/import-products.php
    dev/initdata/import-thirdparties.php
    dev/initdata/import-users.php
    dev/initdata/purge-data.php
    dev/initdemo/initdemo.sh
    dev/initdemo/initdemopassword.sh
    dev/initdemo/savedemo.sh
    dev/initdemo/sftpget_and_loaddump.php
    dev/initdemo/updatedemo.php
    dev/tools/github_authors_peryear.sh
    dev/tools/test/namespacemig/bbb.php
    dev/tools/test/testperf.php
    dev/tools/test/testtcpdf.php
    dev/translation/autotranslator.php
    dev/translation/sanity_check_en_langfiles.php
    dev/translation/strip_language_file.php
    htdocs/includes/stripe/stripe-php/build.php
    htdocs/includes/stripe/stripe-php/update_certs.php
    scripts/accountancy/export-thirdpartyaccount.php
    scripts/bank/export-bank-receipts.php
    scripts/clicktodial/ekiga.sh
    scripts/clicktodial/linphone.sh
    scripts/company/sync_contacts_dolibarr2ldap.php
    scripts/contracts/email_expire_services_to_customers.php
    scripts/contracts/email_expire_services_to_representatives.php
    scripts/cron/cron_run_jobs.php
    scripts/emailings/mailing-send.php
    scripts/emailings/reset-invalid-emails.php
    scripts/invoices/email_unpaid_invoices_to_customers.php
    scripts/invoices/email_unpaid_invoices_to_representatives.php
    scripts/invoices/rebuild_merge_pdf.php
    scripts/members/sync_members_dolibarr2ldap.php
    scripts/members/sync_members_ldap2dolibarr.php
    scripts/members/sync_members_types_dolibarr2ldap.php
    scripts/members/sync_members_types_ldap2dolibarr.php
    scripts/product/migrate_picture_path.php
    scripts/product/regenerate_thumbs.php
    scripts/user/migrate_picture_path.php
    scripts/user/sync_groups_dolibarr2ldap.php
    scripts/user/sync_groups_ldap2dolibarr.php
    scripts/user/sync_users_dolibarr2ldap.php
    scripts/user/sync_users_ldap2dolibarr.php
    scripts/website/migrate-news-joomla2dolibarr.php
    scripts/website/regenerate-pages.php
    scripts/withdrawals/build_withdrawal_file.php
    test/phpunit/CMailFileTest.php
    test/phpunit/ContactTest.php
    test/phpunit/ModulesTest.php
    test/phpunit/PricesTest.php
    test/phpunit/SocieteTest.php
    Please commit your changes or stash them before you merge.
    Aborting
11

Git warns you about local changes to the earlier version.

You can stash them like so:

git stash push --include-untracked

Then try to pull the latest version again. - If the earlier modifications which git is warning you about happened for a reason, you might want to merge them into the new release as well.

12

Hi priojk,

Thanks for your reply.
I’m not sure what those changes are. I assume all DB and user data are all stored separately in dolibarrdata folder.

I’ll try your advice later today and update you again.

13

yes it works! Thanks priojk!