Re: A question about git commiting and files sent from web intarface

2010-09-15 Thread Simos Xenitellis
On Wed, Sep 15, 2010 at 9:16 AM, Baurzhan Muftakhidinov wrote: > Hello, Simos! > > Where can I find files uploaded from web interface of l10n.gnome.org? > > Are they in git? > > Can't find according info in GitHowTo Manual > Hi Baurzhan, When you or your translators (you have Margulan currently

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
is it possible to pause and resume the cloning process. i am having a very slow connection at present and only 46% - 176 mb has been cloned. regards tv wow! thanks for the lesson > > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
does running $ git reset --hard twice revert the local repo two times back? crazy question isn't it? :-)) drtv On Tue, May 26, 2009 at 7:44 PM, Simos Xenitellis < simos.li...@googlemail.com> wrote: > Thanks, I updated the live.gnome.org page accordingly. > If you think there is something that

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
wow! thanks for the lesson regards tv On Tue, May 26, 2009 at 9:00 PM, Simos Xenitellis < simos.li...@googlemail.com> wrote: > However, if you run 'git reset --hard HEAD^', then you alter the > working copy to match > the state before the last commit. If you run this command repeatedly, > then ea

Re: Question about git

2009-05-26 Thread Simos Xenitellis
On Tue, May 26, 2009 at 3:30 PM, Tirumurti Vasudevan wrote: > does running > > $ git reset --hard > > twice revert the local repo two times back? > crazy question isn't it? First of all, 'working copy' are the files that you see in each of the repositories. When you modify a file (such as by upda

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
On Tue, May 26, 2009 at 7:44 PM, Simos Xenitellis < simos.li...@googlemail.com> wrote: > Thanks, I updated the live.gnome.org page accordingly. > If you think there is something that needs to be clarified, feel free > to add to the page. > thanks. i will look at it from a non-tech user point of vi

Re: Question about git

2009-05-26 Thread Simos Xenitellis
On Tue, May 26, 2009 at 1:13 PM, Tirumurti Vasudevan wrote: > > > On Tue, May 26, 2009 at 4:18 PM, Simos Xenitellis > wrote: >> >> I think it is possible this issue will surface in the future, >> therefore it is good we managed to >> document now. We now have a new Troubleshooting entry, >> http:

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
On Tue, May 26, 2009 at 4:18 PM, Simos Xenitellis < simos.li...@googlemail.com> wrote: > I think it is possible this issue will surface in the future, > therefore it is good we managed to > document now. We now have a new Troubleshooting entry, > http://live.gnome.org/action/edit/TranslationProjec

Re: Question about git

2009-05-26 Thread Simos Xenitellis
On Tue, May 26, 2009 at 10:38 AM, Tirumurti Vasudevan wrote: > > > On Mon, May 25, 2009 at 7:14 PM, Claude Paroz wrote: >> >> One possible issue may happen if files are hosted on a FAT filesystem >> (where the mount mask may change the file permissions, notably the >> execute permission). >> >> C

Re: Question about git

2009-05-26 Thread Tirumurti Vasudevan
On Mon, May 25, 2009 at 7:14 PM, Claude Paroz wrote: > One possible issue may happen if files are hosted on a FAT filesystem > (where the mount mask may change the file permissions, notably the > execute permission). > > Claude > i thought hard about this and then realised that i did indeed mess

Re: Question about git

2009-05-25 Thread Simos Xenitellis
On Mon, May 25, 2009 at 3:41 PM, Tirumurti Vasudevan wrote: > same thing is happening with gnome-utils with git status > > i wanted to run git diff AUTHORS but i cant see the end of the list. i > dont return to the command prompt. i expanded the screen size and more > lines appear. >  I opened a t

Re: Question about git

2009-05-25 Thread Tirumurti Vasudevan
same thing is happening with gnome-utils with git status i wanted to run git diff AUTHORS but i cant see the end of the list. i dont return to the command prompt. i expanded the screen size and more lines appear. I opened a tab and wrote git diff AUTHORS i get d...@narayana:~/git/gnome-utils/po$

Re: Question about git

2009-05-25 Thread Tirumurti Vasudevan
On Mon, May 25, 2009 at 6:22 PM, Simos Xenitellis wrote: > It would be very helpful if you could provide a list of commands that > can reproduce > this situation where you get all those 'modified' files. > That is, starting from > > git clone ssh://vasude...@git.gnome.org/git/gedit > > In addition

Re: Question about git

2009-05-25 Thread Tirumurti Vasudevan
On Mon, May 25, 2009 at 7:14 PM, Claude Paroz wrote: > One possible issue may happen if files are hosted on a FAT filesystem > (where the mount mask may change the file permissions, notably the > execute permission). only the po files suffer that. the only system that works for me in translating

Re: Question about git

2009-05-25 Thread Claude Paroz
Le lundi 25 mai 2009 à 13:52 +0100, Simos Xenitellis a écrit : > On Mon, May 25, 2009 at 12:59 PM, Tirumurti Vasudevan > wrote: > > running into similar problem again i resolved it following the advice > > offered here. > > i post this here so that anyone with similar problem can benefit > > > > -

Re: Question about git

2009-05-25 Thread Simos Xenitellis
On Mon, May 25, 2009 at 12:59 PM, Tirumurti Vasudevan wrote: > running into similar problem again i resolved it following the advice > offered here. > i post this here so that anyone with similar problem can benefit > > --- > d...@narayana:~$ cd git/gedit/po > d...@narayana:~/git/gedit/po$ git sta

Re: Question about git

2009-05-25 Thread Tirumurti Vasudevan
looks like git up almost always throws up such msg. i have done four files and every time i had to 'git reset --hard' tv On Mon, May 25, 2009 at 5:29 PM, Tirumurti Vasudevan wrote: > done! whew! -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot

Re: Question about git

2009-05-25 Thread Tirumurti Vasudevan
running into similar problem again i resolved it following the advice offered here. i post this here so that anyone with similar problem can benefit --- d...@narayana:~$ cd git/gedit/po d...@narayana:~/git/gedit/po$ git status # On branch master # Changed but not updated: # (use "git add ..." to

Re: Question about git

2009-05-24 Thread Tirumurti Vasudevan
could i use this script? regards drtv On Sun, May 24, 2009 at 10:25 PM, Simos Xenitellis wrote: > I use a script so that all my modules are 'git up'-ed in one go. It > takes me about 10 minutes for all of GNOME 2.28. -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chi

Re: Question about git

2009-05-24 Thread Simos Xenitellis
On Sun, May 24, 2009 at 5:02 PM, Tirumurti Vasudevan wrote: > On Sun, May 24, 2009 at 9:20 PM, Simos Xenitellis > wrote: >> I think the previous command removed your commit, or something went wrong. >> When you are in doubt, it is good to clean up your local repository and make >> it >> match to

Re: Question about git

2009-05-24 Thread Tirumurti Vasudevan
On Sun, May 24, 2009 at 9:20 PM, Simos Xenitellis wrote: > I think the previous command removed your commit, or something went wrong. > When you are in doubt, it is good to clean up your local repository and make > it > match to what is available on git.gnome.org. That is 'git reset > --hard' and

Re: Question about git

2009-05-24 Thread Simos Xenitellis
On Sun, May 24, 2009 at 4:35 PM, Tirumurti Vasudevan wrote: > On Sun, May 24, 2009 at 4:35 PM, Simos Xenitellis > wrote: > >> These files were last modified in 2007. >> When you type 'git log thumbnailer/evince-thumbnailer-ps.schemas.in' >> you get >> ... >> Date:   Sun Apr 8 15:34:43 2007 +

Re: Question about git

2009-05-24 Thread Tirumurti Vasudevan
On Sun, May 24, 2009 at 4:35 PM, Simos Xenitellis wrote: > These files were last modified in 2007. > When you type 'git log thumbnailer/evince-thumbnailer-ps.schemas.in' > you get > ... > Date:   Sun Apr 8 15:34:43 2007 + > ... > > It is unclear why they would be modified in your case. well.

Re: Question about git

2009-05-24 Thread Tirumurti Vasudevan
huh! or intltool-update ta ? will think over what you hav said thanks tv On Sun, May 24, 2009 at 3:46 PM, Johannes Schmid wrote: > You have to run git rebase origin again here because the last rebase > failed because of your uncommitted changes. > -- My blogs: [all in Tamil] http://anmikam4du

Re: Question about git

2009-05-24 Thread Tirumurti Vasudevan
quite a few lessons here. i shall read in time absorb work at it and get back to you. thanks a lot! drtv On Sun, May 24, 2009 at 4:35 PM, Simos Xenitellis wrote: > Tell me if http://live.gnome.org/TranslationProject/GitHowTo is > unclear with the instructions when trying to fix the local git > re

Re: Question about git

2009-05-24 Thread Simos Xenitellis
On Sun, May 24, 2009 at 7:16 AM, Tirumurti Vasudevan wrote: > On Sun, May 24, 2009 at 7:04 AM, Tirumurti Vasudevan > wrote: >> yes it is a little difficult to keep track of what has changed since >> last commit. >> one has to look at the number of strings of each and every module. >> > -

damned-lies account (was Re: Question about git)

2009-05-24 Thread Christian Rose
On 5/23/09, Claude Paroz wrote: > Le samedi 23 mai 2009 à 19:24 +0200, Johannes Schmid a écrit : > > Am Samstag, den 23.05.2009, 22:05 +0500 schrieb Nurali Abdurahmonov: > > > Hi all. In uzbekistan internet traffic very expensive. In git I > > spend more traffic than svn. I use dial-up connect

Re: Question about git

2009-05-24 Thread Johannes Schmid
Hi! > d...@narayana:~/git/evince/po$ git reset --hard HEAD^ > HEAD is now at f9b57c7 [printing] Fixes crash found by tests > d...@narayana:~/git/evince/po$ git status > # On branch master > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # evince.pot >

Re: Question about git

2009-05-23 Thread Tirumurti Vasudevan
On Sun, May 24, 2009 at 7:04 AM, Tirumurti Vasudevan wrote: > yes it is a little difficult to keep track of what has changed since > last commit. > one has to look at the number of strings of each and every module. > -- well i made that effort to keep track and found some updates. e-g: E

Re: Question about git

2009-05-23 Thread Tirumurti Vasudevan
yes it is a little difficult to keep track of what has changed since last commit. one has to look at the number of strings of each and every module. drtv On Sat, May 23, 2009 at 11:37 PM, Claude Paroz wrote: > Unfortunately, there is still no progress on the front of 'auto-commit' > functionalit

Re: Question about git

2009-05-23 Thread Claude Paroz
Le samedi 23 mai 2009 à 19:24 +0200, Johannes Schmid a écrit : > Hi! > > Am Samstag, den 23.05.2009, 22:05 +0500 schrieb Nurali Abdurahmonov: > > Hi all. In uzbekistan internet traffic very expensive. In git I > spend more traffic than svn. I use dial-up connection. With this > connection I canno

Re: Question about git

2009-05-23 Thread Johannes Schmid
Hi! Am Samstag, den 23.05.2009, 22:05 +0500 schrieb Nurali Abdurahmonov: > Hi all. In uzbekistan internet traffic very expensive. In git I spend more > traffic than svn. I use dial-up connection. With this connection I cannot > clone big modules like gtk. Can I clone "po" folder only? Or can I

Question about git

2009-05-23 Thread Nurali Abdurahmonov
Hi all. In uzbekistan internet traffic very expensive. In git I spend more traffic than svn. I use dial-up connection. With this connection I cannot clone big modules like gtk. Can I clone "po" folder only? Or can I use svn for my translations? ___ gn

Re: Question about git

2009-05-08 Thread Filippo Argiolas
On Fri, May 8, 2009 at 1:39 PM, Simos Xenitellis wrote: > OK, I have updated the instructions at > http://live.gnome.org/TranslationProject/GitHowTo#head-0a9ee3ff743fcd06eb70ab98c93780c48d724a1f Thank you, it's fine for me now :) Filippo ___ gnome-i18n

Re: Question about git

2009-05-08 Thread Simos Xenitellis
On Fri, May 8, 2009 at 7:30 AM, Filippo Argiolas wrote: > On Thu, May 7, 2009 at 2:23 AM, Behdad Esfahbod wrote: >> On 05/06/2009 07:00 AM, Simos Xenitellis wrote: >>> >>> On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbod  wrote: On 05/05/2009 01:28 AM, Shaun McCance wrote: >> Th

Re: Question about git

2009-05-07 Thread Filippo Argiolas
On Thu, May 7, 2009 at 2:23 AM, Behdad Esfahbod wrote: > On 05/06/2009 07:00 AM, Simos Xenitellis wrote: >> >> On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbod  wrote: >>> >>> On 05/05/2009 01:28 AM, Shaun McCance wrote: >>> > This assumes that the branch is merged into master otherwise.  I >>>

Re: Question about git

2009-05-06 Thread Behdad Esfahbod
On 05/06/2009 07:00 AM, Simos Xenitellis wrote: On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbod wrote: On 05/05/2009 01:28 AM, Shaun McCance wrote: This assumes that the branch is merged into master otherwise. I strongly suggest cherry-pick instead of merge. Isn't that going to cause merge

Re: Question about git

2009-05-06 Thread Simos Xenitellis
On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbod wrote: > On 05/05/2009 01:28 AM, Shaun McCance wrote: > >>> This assumes that the branch is merged into master otherwise.  I strongly >>> suggest cherry-pick instead of merge. >> >> Isn't that going to cause merge conflicts for me the >> maintainer w

Re: Question about git

2009-05-05 Thread Behdad Esfahbod
On 05/05/2009 01:28 AM, Shaun McCance wrote: This assumes that the branch is merged into master otherwise. I strongly suggest cherry-pick instead of merge. Isn't that going to cause merge conflicts for me the maintainer when I try to merge from my stable branches to master? I can pretty much

Re: Question about git

2009-05-04 Thread Shaun McCance
Hi, > >>> > >>> here I come again with silly question about git. :) > >>> > >>> I did look at the documentation, but didn't find an answer so maybe some > >>> more involved git user could tell me if it's possible or not. > >

Re: Question about git

2009-05-04 Thread Behdad Esfahbod
On 05/04/2009 07:07 PM, Simos Xenitellis wrote: On Mon, May 4, 2009 at 11:10 PM, Gil Forcada wrote: El dl 04 de 05 de 2009 a les 23:00 +0200, en/na Milo Casagrande va escriure: Hi, here I come again with silly question about git. :) I did look at the documentation, but didn't find an a

Re: Question about git

2009-05-04 Thread Simos Xenitellis
On Tue, May 5, 2009 at 12:07 AM, Simos Xenitellis wrote: > On Mon, May 4, 2009 at 11:10 PM, Gil Forcada wrote: >> El dl 04 de 05 de 2009 a les 23:00 +0200, en/na Milo Casagrande va >> escriure: >>> Hi, >>> >>> here I come again with silly questi

Re: Question about git

2009-05-04 Thread Simos Xenitellis
On Mon, May 4, 2009 at 11:10 PM, Gil Forcada wrote: > El dl 04 de 05 de 2009 a les 23:00 +0200, en/na Milo Casagrande va > escriure: >> Hi, >> >> here I come again with silly question about git. :) >> >> I did look at the documentation, but didn't find an

Re: Question about git

2009-05-04 Thread Gil Forcada
El dl 04 de 05 de 2009 a les 23:00 +0200, en/na Milo Casagrande va escriure: > Hi, > > here I come again with silly question about git. :) > > I did look at the documentation, but didn't find an answer so maybe some > more involved git user could tell me if it's

Question about git

2009-05-04 Thread Milo Casagrande
Hi, here I come again with silly question about git. :) I did look at the documentation, but didn't find an answer so maybe some more involved git user could tell me if it's possible or not. Is it possible to merge a single file from two different branches? Say I commit a translatio