Date: prev next · Thread: first prev next last
2014 Archives by date, by thread · List index


Hi,

So you want to reset your local branch to libreoffice-4-2, right? I
think what you need is switching to your local branch and doing

git reset --hard origin/libreoffice-4-2

This should ensure that you reset to the "real" libreoffice-4-2 branch
from remote, not to anything you might have messed up in your local
libreoffice-4-2 branch.

Regards,
Ruslan

On Thu, May 1, 2014 at 12:11 PM, Laurent BP <jumbo4444@yahoo.fr> wrote:
Hello,

Thanks for your comments. However I did not yet succeed.


Christian Lohmaier-3 wrote
Hmm. I wouldn't do that (as I don't know what that would do), instead I'd
do a

git checkout -b myoldlibreofficebranch whatevergitcommityoupicked

That should do the trick.

I tried the following commands:
git checkout -b myoldlibreofficebranch
dace560b350346b9f9a102ee602bb129a008bcfe
make distclean
./autogen.sh && make
./instdir/program/soffice
But About box says: Version: 4.3.0.0.alpha1+
Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa

However, "git log -1" returns
==================================
commit dace560b350346b9f9a102ee602bb129a008bcfe
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Fri Oct 11 20:45:22 2013 +0100

    CID#736194 out of bounds

    Change-Id: I236c2f51716bfebd0c132bbaed50c1f1ec811ffa
==================================

"git branch" returns
==================================
  UITrendLineNbPoints
  commandNameEnterGroup
  importDrawAOO4
  libreoffice-4-2
  master
* myoldlibreofficebranch
==================================

and "git status" returns (my own translation)
# On branch myoldlibreofficebranch
# Files not followed:
#   (use "git add <file>..." to include in what will be validated)
#
#       external/tarballs/
#       ios/lo.xcconfig

I do not understand what is happening :(
"git" seems to be OK but "make" seems to build another branch (actually my
branch "master")


Christian Lohmaier-3 wrote
btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-)

No, I did not update my signature for a long time.

Many thanks in advance for your help.

Laurent BP



-----
LibreOffice 4.2.4.1
--
View this message in context: 
http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107083.html
Sent from the Dev mailing list archive at Nabble.com.
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.