[dev] Question about merge

[Jan Schneider]

Zitat von Nuno Loureiro <nuno@eth.pt>:

> Hi!
> 
>   I have a question about the merging. The merge is from CVS HEAD to CVS
> RELENG, right? If so, why aren't my pt_PT translations updates in RELENG
> if Jan committed them to CVS in 6th March?
> 
>   I just checked out Horde RELENG_2, IMP RELENG_3, and Turba RELENG_1
> and I don't see my updates there. Should I rest and sleep first, before
> sending such message to the mailing list? ;)

No, that's a good question.

The problem is that - even after mergin a lot like we did now - these two 
branches still differ a lot. That's the reason why we can't just merge the 
translations from HEAD to RELENG, they have to be translated on their own.

Jan.

--
http://www.horde.org - The Horde Project
http://www.ammma.de - discover your knowledge
http://www.tip4all.de - Deine private Tippgemeinschaft


>From nuno@eth.pt Date: 11 Mar 2002 20:06:17 +0000
Return-Path: <nuno@co.eth.pt>
Mailing-List: contact dev-help@lists.horde.org; run by ezmlm
Delivered-To: mailing list dev@lists.horde.org
Received: (qmail 47353 invoked from network); 11 Mar 2002 20:06:43 -0000
Received: from hq.eth.pt (root@194.65.84.1)
  by clark.horde.org with SMTP; 11 Mar 2002 20:06:43 -0000
Received: from dev.hq.eth.pt (dev.hq.eth.pt [10.1.1.10])
	by hq.eth.pt (8.11.6/8.11.6) with ESMTP id g2BK6b121774
	for <dev@lists.horde.org>; Mon, 11 Mar 2002 20:06:37 GMT
From: Nuno Loureiro <nuno@eth.pt>
To: dev@lists.horde.org
In-Reply-To: <1015870200.3c8cf2f837ff2@jan.dip.ammma.net>
References: <1015869830.1214.26.camel@dev.hq.eth.pt> 
	<1015870200.3c8cf2f837ff2@jan.dip.ammma.net>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-Mailer: Evolution/1.0.2 
Date: 11 Mar 2002 20:06:17 +0000
Message-Id: <1015877177.1214.35.camel@dev.hq.eth.pt>
Mime-Version: 1.0
Subject: Re: [dev] Question about merge



On Mon, 2002-03-11 at 18:10, Jan Schneider wrote:
> The problem is that - even after mergin a lot like we did now - these two=
=20
> branches still differ a lot. That's the reason why we can't just merge th=
e=20
> translations from HEAD to RELENG, they have to be translated on their own=
.

Okay!
I'll merge HEAD translations to RELENG, fix them and commit them.

Nuno

--=20
Nuno Loureiro <nuno@eth.pt>
Ethernet, Solu=E7=F5es Inform=E1ticas, LDA
http://www.eth.pt