RSS/Atom feed Twitter
Site is read-only, email is disabled
  1. Chat
  2. Useful links
  3. Polls

Featured content

new branch "gimp-help-2-6-0"

This discussion is connected to the gimp-docs-list.gnome.org mailing list which is provided by the GIMP developers and not related to gimpusers.com.

This is a read-only list on gimpusers.com so this discussion thread is read-only, too.

8 of 9 messages available
Toggle history

Please log in to manage your subscriptions.
mailman.5.1251745207.20057.... 07 Oct 20:29
  Gimp-docs Digest, Vol 63, Issue 22 Vitaly Lomov 04 Sep 11:46
   new branch "gimp-help-2-6-0" Ulf-D. Ehlert 07 Sep 11:53
    new branch "gimp-help-2-6-0" Sven Neumann 08 Sep 00:21
     new branch "gimp-help-2-6-0" Ulf-D. Ehlert 08 Sep 11:45
      new branch "gimp-help-2-6-0" Sven Neumann 08 Sep 20:57
    new branch "gimp-help-2-6-0" Sven Neumann 08 Sep 21:29
     new branch "gimp-help-2-6-0" Ulf-D. Ehlert 09 Sep 20:18
    new branch "gimp-help-2-6-0" Andrew Douglas Pitonyak 10 Sep 23:23
Vitaly Lomov
2009-09-04 11:46:14 UTC (over 15 years ago)

Gimp-docs Digest, Vol 63, Issue 22

I am fine too. We won't have the full translation for the release any time soon, so our users will have to learn a bit of English :) My only concern is git. I botched it once (because of a conflict) and had to clone the whole tree again. With these branches being introduced, I may mess up again. I am only a quarter way through git manual, so the exact git command lines for the freeze will help.

Date: Mon, 31 Aug 2009 10:28:54 +0400 From: Alexandre Prokoudine
Subject: Re: [Gimp-docs] release, pretty please To: "Gimp-docs@lists.XCF.Berkeley.EDU"        
Message-ID:
       
Content-Type: text/plain; charset=ISO-8859-1

On Sat, Aug 29, 2009 at 4:51 PM, Ulf-D. Ehlert wrote:

Sven Neumann (Donnerstag, 27. August 2009, 22:19):

Right. The consequence now is that a freeze is unavoidable if you want to get a release out.

Since there's no feedback from Roman, I suggest making a freeze next week, that is

? ? ? ?Mon, 07 Sep 2009, 00:00:00 +0000 (UTC).

Then we (=anybody) create a branch (origin/gimp-help-2-6-0?) where no changes of the English text are allowed any more.

At this point Roman should be able to release an English HTML package, and localized HTML packages are released as soon as the respective translation is complete.

Is this okay with everybody?

Fine with me, can't speak for Vitaly :)

Alexandre

------------------------------

Ulf-D. Ehlert
2009-09-07 11:53:10 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Vitaly Lomov (Freitag, 4. September 2009, 11:46): [...]

My only concern is git. I botched it once (because of a conflict) and had to clone the whole tree again. With these branches being introduced, I may mess up again. I am only a quarter way through git manual, so the exact git command lines for the freeze will help.

We are git newbies too...
As far as I understand it, everything should be fine if you create a local branch, e.g.
git branch gimp-help-2-6-0 origin/gimp-help-2-6-0 (switch to this branch) and work on this branch only. 'git pull' and 'git push' should automatically read from and write to the remote branch "origin/gimp-help-2-6-0" -- but to be sure you can try 'git push --dry-run' the first time.

If you have a problem with conflicts, you may want to try 'git stash ...' in order to create a clean working directory.

HTH Ulf

Sven Neumann
2009-09-08 00:21:56 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Hi,

On Mon, 2009-09-07 at 11:53 +0200, Ulf-D. Ehlert wrote:

As far as I understand it, everything should be fine if you create a local branch, e.g.
git branch gimp-help-2-6-0 origin/gimp-help-2-6-0 (switch to this branch) and work on this branch only. 'git pull' and 'git push' should automatically read from and write to the remote branch "origin/gimp-help-2-6-0"

Better to pass the --track option to 'git branch'. Then the local branch will pull and push from the remote branch as you described.

Sven

Ulf-D. Ehlert
2009-09-08 11:45:04 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Sven Neumann (Dienstag, 8. September 2009, 00:22):

Better to pass the --track option to 'git branch'. Then the local branch will pull and push from the remote branch as you described.

Isn't this the default?

$> git help branch ...
--track
...
This behavior is the default when the start point is a remote branch.
...

Ulf

Sven Neumann
2009-09-08 20:57:56 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Hi,

On Tue, 2009-09-08 at 11:45 +0200, Ulf-D. Ehlert wrote:

Sven Neumann (Dienstag, 8. September 2009, 00:22):

Better to pass the --track option to 'git branch'. Then the local branch will pull and push from the remote branch as you described.

Isn't this the default?

$> git help branch ...
--track
...
This behavior is the default when the start point is a remote branch.

Ah, good to know. Unfortunately only newer git clients support the --track option. With older clients you need to specify the remote branch whenever you push or pull.

Sven

Sven Neumann
2009-09-08 21:29:45 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Hi,

is the plan still to make an english-only release from the new branch? If so, what are we waiting for? If someone prepares a (tested) tarball that includes the generated HTML for the English language, then I can upload it to the ftp server.

Sven

Ulf-D. Ehlert
2009-09-09 20:18:38 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

Sven Neumann (Dienstag, 8. September 2009, 21:29):

is the plan still to make an english-only release from the new branch?

Yes, Roman is working on it.

If so, what are we waiting for?

Roman just wants to add a few metafiles and write the release notes.

Ulf

Andrew Douglas Pitonyak
2009-09-10 23:23:26 UTC (over 15 years ago)

new branch "gimp-help-2-6-0"

It looks like I lost some of this thread (because it appears to start in the middle).

I have open changes. I have never worried about branches. I have only used

git clone git://git.gnome.org/gimp-help-2

It is easy for me to trash my changes and then manually insert them into what ever is new if needed.

andrew pitonyak