lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: all must do a new clone - new git repository with fixed history


From: Francisco Vila
Subject: Re: all must do a new clone - new git repository with fixed history
Date: Fri, 26 Mar 2010 18:40:51 +0100

2010/3/26 Francisco Vila <address@hidden>:
> 2010/3/25 Jan Nieuwenhuizen <address@hidden>:
>> Hi,
>>
>> The git repository at savannah has been updated, everyone
>> should do a fresh clone.
>
> I am trying to merge master into lilypond/translation.
> From your last commit (which you have commited into master branch)
> some conflicts result. Where did you take
> 5eb98733e6102cca2eaf2cf56ec9d576ddb4638e from? It does not exist
> AFAICT

To be more precise: I've still haven't found any of the new
translation markers which doesn't give "bad object" error.

$ git branch
  lilypond/translation
* master

$ git show 342effa46c75df8486095f0f6e50207ca7543512 | head -n 19
commit 342effa46c75df8486095f0f6e50207ca7543512
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Mar 25 12:11:11 2010 +0100

    lily.git: Rewrite translation markers.

diff --git a/Documentation/de/dedication.itely
b/Documentation/de/dedication.itely
index f92cc11..47cc74f 100644
--- a/Documentation/de/dedication.itely
+++ b/Documentation/de/dedication.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-

 @ignore
-    Translation of GIT committish: 7b70644b95f383b4281e9ffa146d315d2ada11d3
+    Translation of GIT committish: e06e8e778727a791d97d78ffb2c4906ceb0d9f24

     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'

$ git show e06e8e778727a791d97d78ffb2c4906ceb0d9f24
fatal: bad object e06e8e778727a791d97d78ffb2c4906ceb0d9f24

$_

Any ideas? I could be doing something bad here. Thanks,
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com




reply via email to

[Prev in Thread] Current Thread [Next in Thread]