Re: [Gimp-developer] git commit problems

[Kolbjørn Stuestøl]

Thank you, Sven
I have saved your answer for later use and will give your suggestions a try.

Kolbjørn


Den 15.01.2016 08:28, Sven Claussner skreiv:

Hi Kolbjørn,

On  14.1.2016 at 8:43 PM Kolbjørn Stuestøl wrote:

Is there a separate branch for the 2.8 version?
"git checkout gimp-2-8" or something?


Exactly. At https://git.gnome.org/browse/gimp/ top left is a list box
where you can see all branches. At the command prompt
  git ls-remote origin
  git remote show origin
are your friends.


Normally I am a curious person but the world of computers are too
complex for me now.


Don't judge from git to the world of computers. Git is known to be a
usability beast even for developers. You'll learn from practice and
eventually it's only few commands you need for regular use.
If you need help, just ask and often you'll get an answer here or in
IRC. In IRC mikachu is our git expert, but many of the others know git 
as well.

You might also find our Problems and Solutions page useful:
http://wiki.gimp.org/wiki/Hacking:Problems_and_solutions

If you feel more comfortable with a GUI client, then gitk, git-gui,
SmartGit or the GitExtensions might be your choice. Gitk and git-gui
are part of git. SmartGit is a comfortable third-party GUI client and
considered quite user friendly. It runs on Mac OS X, Windows and Linux.
I also made positive experiences with GitExtensions on Windows. They
are well integrated into Windows Explorer and Visual Studio.

Greetings

Sven




___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: 
https://mail.gnome.org/mailman/listinfo/gimp-developer-list

List archives: https://mail.gnome.org/archives/gimp-developer-list




___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

Re: [Gimp-developer] git commit problems

[Tobias Ellinghaus]

Am Donnerstag, 14. Januar 2016, 18:15:44 schrieb Kolbjørn Stuestøl:

[...]

> > and have 1 and 8 different commits each, respectively.

The "1" is your commit and the "8" are the ones you don't have yet.

> and then a list of  about 450 modified images ("icons/Symbolic/…") (but
> not by me) + a few other files.

Ignore them.

> "git pull" returned:
> > remote: Counting objects: 9, done.
> > remote: Compressing objects: 100% (5/5), done.
> > remote: Total 5 (delta 4), reused 0 (delta 0)
> > Unpacking objects: 100% (5/5), done.
> > From ssh://git.gnome.org/git/gimp
> > 
> >6ba9acd..2e7ebde  master -> origin/master
> > 
> > error: Your local changes to the following files would be overwritten
> > 
> > by merge:
> > themes/The-Dark-Side-of-Gimp/gtkrc

That's something that shouldn't happen, maybe someone messed with git?

> > Please, commit your changes or stash them before you can merge.
> > Aborting
> 
> I have not changed "themes/The-Dark-Side-of-Gimp/gtkrc" or other files
> except a few nn.po files not listed. So I could delete the file, and
> then the next file(s) to be overwritten and so one.

git checkout themes/The-Dark-Side-of-Gimp/gtkrc

will reset that file to the original state.

> A proof that my "git push" did not reach the server for some reason or
> other?

Yes, it didn't reach the server.

> As I said before I am an unskilled (and a bit lazy) git user who think
> it is safest and easiest for me to start all over again with "git clone …".

I know that feeling ...

> Kolbjørn

Tobias

[...]

signature.asc
Description: This is a digitally signed message part.
___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

Re: [Gimp-developer] git commit problems

[Alexandre Prokoudine]

On Tue, Jan 12, 2016 at 12:55 AM, Kolbjørn Stuestøl wrote:
> When committing my translation all looks well on my local copy. But my
> translations do not shows up in the https://git.gnome.org/browse/gimp/ site.

With basic configuration (author name and email) and a combination of...

1. git clone ssh://[username]@git.gnome.org/git/gimp
2. git commit -m "[description]" [file]
3. git push origin master

...you should be able to get work done.

What exactly did you do to push?

Alex
___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

Re: [Gimp-developer] git commit problems

[Kolbjørn Stuestøl]

Den 14.01.2016 16:55, Tobias Ellinghaus skreiv:

Am Donnerstag, 14. Januar 2016, 16:40:02 schrieb Kolbjørn Stuestøl:

Den 14.01.2016 12:29, Alexandre Prokoudine skreiv:

On Tue, Jan 12, 2016 at 12:55 AM, Kolbjørn Stuestøl wrote:

When committing my translation all looks well on my local copy. But my
translations do not shows up in the https://git.gnome.org/browse/gimp/
site.>

With basic configuration (author name and email) and a combination of...

1. git clone ssh://[username]@git.gnome.org/git/gimp
2. git commit -m "[description]" [file]
3. git push origin master

...you should be able to get work done.

Thank you.
I'll give this a try later this night.


What exactly did you do to push?

Oh, I forgot to add a copy of this command in my e-mail. Should be:
 $ git commit -m "Updated Norwegian (nn) translations"
 [master 7b2f8a5] Updated Norwegian (nn) translations
   5 files changed, 13801 insertions(+), 9813 deletions(-)
   mode change 100644 => 100755 po-plug-ins/nn.po
   mode change 100644 => 100755 po-python/nn.po
$ git push

I have never added anything to the push command like "git push origin
master" as you write.
I do not remember the answer from the server. Sorry.
To me (unskilled git user) it looks like the push command did not
reached the server or was performed in an unusual way or something. But
this is a guess.

Try "git status", maybe it told you that you have to fetch changes from the
server first? In that case just run "git pull" [0] and then "git push" again.

Thank you for your answer and advise.

"git status" returned:

'On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 8 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)'
and then a list of  about 450 modified images ("icons/Symbolic/…") (but 
not by me) + a few other files.


"git pull" returned:

remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From ssh://git.gnome.org/git/gimp
   6ba9acd..2e7ebde  master -> origin/master
error: Your local changes to the following files would be overwritten 
by merge:

themes/The-Dark-Side-of-Gimp/gtkrc
Please, commit your changes or stash them before you can merge.
Aborting
I have not changed "themes/The-Dark-Side-of-Gimp/gtkrc" or other files 
except a few nn.po files not listed. So I could delete the file, and 
then the next file(s) to be overwritten and so one.


A proof that my "git push" did not reach the server for some reason or 
other?


As I said before I am an unskilled (and a bit lazy) git user who think 
it is safest and easiest for me to start all over again with "git clone …".


Kolbjørn





Kolbjørn

Tobias

[0] Now people will scold me and tell you that you should use "git fetch" and
then rebase. Better wait for them to give you exact commands to run, I have no
idea about those.


___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list


___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

Re: [Gimp-developer] git commit problems

[Sven Claussner]

Hi Kolbjørn,

On  14.1.2016 at 8:43 PM Kolbjørn Stuestøl wrote:

Is there a separate branch for the 2.8 version?
"git checkout gimp-2-8" or something?


Exactly. At https://git.gnome.org/browse/gimp/ top left is a list box
where you can see all branches. At the command prompt
  git ls-remote origin
  git remote show origin
are your friends.


Normally I am a curious person but the world of computers are too
complex for me now.


Don't judge from git to the world of computers. Git is known to be a
usability beast even for developers. You'll learn from practice and
eventually it's only few commands you need for regular use.
If you need help, just ask and often you'll get an answer here or in
IRC. In IRC mikachu is our git expert, but many of the others know git 
as well.

You might also find our Problems and Solutions page useful:
http://wiki.gimp.org/wiki/Hacking:Problems_and_solutions

If you feel more comfortable with a GUI client, then gitk, git-gui,
SmartGit or the GitExtensions might be your choice. Gitk and git-gui
are part of git. SmartGit is a comfortable third-party GUI client and
considered quite user friendly. It runs on Mac OS X, Windows and Linux.
I also made positive experiences with GitExtensions on Windows. They
are well integrated into Windows Explorer and Visual Studio.

Greetings

Sven




___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

Re: [Gimp-developer] git commit problems

[Kolbjørn Stuestøl]

Den 14.01.2016 12:29, Alexandre Prokoudine skreiv:

On Tue, Jan 12, 2016 at 12:55 AM, Kolbjørn Stuestøl wrote:

When committing my translation all looks well on my local copy. But my
translations do not shows up in the https://git.gnome.org/browse/gimp/ site.

With basic configuration (author name and email) and a combination of...

1. git clone ssh://[username]@git.gnome.org/git/gimp
2. git commit -m "[description]" [file]
3. git push origin master

...you should be able to get work done.

Thank you.
I'll give this a try later this night.



What exactly did you do to push?

Oh, I forgot to add a copy of this command in my e-mail. Should be:
   $ git commit -m "Updated Norwegian (nn) translations"
   [master 7b2f8a5] Updated Norwegian (nn) translations
 5 files changed, 13801 insertions(+), 9813 deletions(-)
 mode change 100644 => 100755 po-plug-ins/nn.po
 mode change 100644 => 100755 po-python/nn.po
$ git push

I have never added anything to the push command like "git push origin 
master" as you write.

I do not remember the answer from the server. Sorry.
To me (unskilled git user) it looks like the push command did not 
reached the server or was performed in an unusual way or something. But 
this is a guess.


Kolbjørn


Alex
___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list





___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list

[Gimp-developer] git commit problems

[Kolbjørn Stuestøl]

When committing my translation all looks well on my local copy. But my 
translations do not shows up in the https://git.gnome.org/browse/gimp/ 
site. Where is my translations gone?


I downloaded my copies using "git clone ssh://[my 
username]@git.gnome.org/git/gimp".

Updated and translated some po files and then:

   $ git commit -m "Updated Norwegian (nn) translations"
   [master 7b2f8a5] Updated Norwegian (nn) translations
 5 files changed, 13801 insertions(+), 9813 deletions(-)
 mode change 100644 => 100755 po-plug-ins/nn.po
 mode change 100644 => 100755 po-python/nn.po

My local git log shows:

   $ git log
   commit 7b2f8a5cff63bdea6db76b642445cfb8a11d1b0b
   Author: kolbjoern 
   Date:   Mon Jan 11 21:19:53 2016 +0100

Updated Norwegian (nn) translations

   commit 97ea600623b780fc9dba4abbaa45db44e626a10e
   Author: Michael Natterer 
   Date:   Mon Jan 11 20:35:32 2016 +0100

app: s/Default/Color/ in the testing icon theme Makefile rules
   …

My commit must obviously go somewhere but I have no idea where.
How to get it to upload (git push) to the correct gimp repository?

Last time I uploaded my files (2016.01.07) I got the error message 
"remote: error: refname 'GIMP_HELP_2_8_2' is ambiguous" (but the "git 
push" succeeded) and I was told to run "git config --global push.default 
matching" and/or
"git config --global push.default simple". I did this in that order. No 
error messages.


Kolbjørn
___
gimp-developer-list mailing list
List address:gimp-developer-list@gnome.org
List membership: https://mail.gnome.org/mailman/listinfo/gimp-developer-list
List archives:   https://mail.gnome.org/archives/gimp-developer-list