[Aptitude-devel] Branches in aptitude, where to work on translations?

[Jens Seidel]

Hi Daniel,

didn't I start using the mailing list inseatd of private mail?

On Tue, Feb 17, 2009 at 07:37:20AM -0800, Daniel Burrows wrote:
> On Tue, Feb 17, 2009 at 09:41:06AM +0100, Jens Seidel <jensseidel at users.sf.net> was heard to say:
> > Is it OK to continue working in this branch, will you merge this branch with
> > the post-lenny branch (which includes gtk stuff, ...) or what is the plan?
> 
>   I think that the post-lenny branch is probably a better place to work
> for now.  Maybe this weekend I'll merge it into HEAD and shut that
> branch down.  That will mean no more (easy) upstream releases from the
> current stable branch, but it'll also be easier to have all the work
> happening in one place.

OK, good to know.
 
>   I tried merging head into post-lenny, but the translation merge
> looked scary -- I didn't know which branch had important work, or if
> they both did.  Probably safer if I leave it to you.

Yep, translations cannot easily be merged. But in the past translation
updates where *only* committed to head. There was, IIRC, only a single
exception, and I will care about it. You can nevertheless keep the PO files
in current head unchanged and after the merge call make update-po.

I hope I will be able to access the post_lenny branch even after you
removed it. I don't know hg very well (only CVS, Subversion and I even
failed to learn git during many weeks (it's just too complex) :-))

Jens