[Localization] [sugar] Branch rename, update-1 -> ship-2

[Sayamindu Dasgupta]

Hi,
Ok - so my reading is, the Update 1 (Core) project that we were doing
stays - and Ship 2 has already been dealt with, and from a
translator's point of view, we need not worry much about Ship-2.
(Apologies if I sound confused)

Also, it looks like the branch renaming confused git at the Pootle end:


pootle at translate:~/checkouts/update1_core/write$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.update-1.merge' in
your configuration file does not tell me either.  Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.update-1.remote = <nickname>
    branch.update-1.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.


Can anyone tell me how to fix this ?
Warm regards,
Sayamindu


On Dec 11, 2007 1:02 AM, Jim Gettys <jg at laptop.org> wrote:
>
> No, we have update.1...  We had to quickly do Ship.2 to fix some
> pressing wireless and upgrade problems....
>
> See: https://dev.laptop.org/roadmap for details.
>                        - Jim
>
>
>
> On Tue, 2007-12-11 at 00:47 +0530, Sayamindu Dasgupta wrote:
> > Hi,
> > Apologies for the delayed reply.
> >
> > On Dec 7, 2007 3:38 PM, Marco Pesenti Gritti <mpgritti at gmail.com> wrote:
> > > On Dec 7, 2007 10:25 AM, Sayamindu Dasgupta <sayamindu at gmail.com> wrote:
> > > > Hi Marco,
> > > > How do we "switch" to the ship-2 branch in such a case ? Do the normal
> > > > rules apply, or is there any simpler procedure (since this is a simple
> > > > rename) ?
> > >
> > > I'm not sure how pootle is handling branches, but yeah this is
> > > basically just another branch.
> >
> > So the update-1 branch no longer exists, and we have ship-2 branch in
> > place - right ?
> >
> > > Btw it would be good to chat about the update-1 branches which we
> > > started to create, if you have any time today...
> > >
> >
> > We are using a system where we have a directory (update1_core) where
> > all the modules which have an update-1 branch are kept (with the
> > active branch being update-1). Pootle sees a file called
> > translations/update-1/xx/module.po which is a symlink to
> > checkouts/update-1/modules/po/xx.po. Thus Pootle thinks that Update 1
> > (Core) is a single project with multiple PO files to translate.
> > We have a few scripts to handle this symlinking and to ensure sanity
> > (no invalid links, no non-symlink files in translations/).
> > This makes things a bit complicated at our end, but makes the job of
> > the translation coordinator for a particular team easy, and it is also
> > easy to gather overall statistics.
> >
> > I'll be on IRC for the entire day tomorrow - feel free to ping me
> > anytime (my nick is unmadindu)
> >
> >
> > Warm regards,
> > Sayamindu
> >
> --
> Jim Gettys
> One Laptop Per Child
>
>
>



-- 
Sayamindu Dasgupta
[http://sayamindu.randomink.org/ramblings]