Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2013-04

Cygwin on git and file modes

6 messages · 4 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Lubos Pintes

Hi,
So I set up Lazarus git repository and started to play with it. I made some changes and viewed generated patch. Everything seemed ok except lines like
mode changed from 100644 to 100755
or similar. I never heard about Windows having file modes like Linux. So can I ignore this, or do I need to setup something differently? I made changes in Lazarus, and then added/committed changes to newly created branch based on upstream.

Reply by email

Juha Manninen
to Lubos Pintes
Lubos Pintes wrote 8 lines
So I set up Lazarus git repository and started to play with it. I made some changes and viewed generated patch. Everything seemed ok except lines like mode changed from 100644 to 100755 or similar. I never heard about Windows having file modes like Linux. So can I ignore this, or do I need to setup something differently? I made changes in Lazarus, and then added/committed changes to newly created branch based on upstream.

We can test it. Please send your patch and I try to apply it on Linux.

Juha

Reply by email

Lubos Pintes
to Juha Manninen: We can test it. Please send your patch and I try to apply it on Linux. Juha

Patches attached.
Also I had similar problem I described yesterday, I am sure I am doing something wrong.
As usual (I think, not still very experienced git user), someone switches branches often, does pulls etc. So before I generated patches I just attached, git told me something like
"cannot rebase, you have uncommitted changes", and that change was something like
objinspstrconsts.cs.po.
I am sure I didn't touch the file. So I stashed it, rebased and then generated patches. So what I am doing wrong?
Who generates those .po files and when?

D?a 7. 4. 2013 12:02 Juha Manninen wrote / nap?sal(a):

Show quoted text 19 lines
On Sun, Apr 7, 2013 at 12:14 PM, Lubos Pintes wrote: > So I set up Lazarus git repository and started to play with it. > I made some changes and viewed generated patch. Everything seemed ok except > lines like > mode changed from 100644 to 100755 > or similar. I never heard about Windows having file modes like Linux. > So can I ignore this, or do I need to setup something differently? > I made changes in Lazarus, and then added/committed changes to newly created > branch based on upstream. We can test it. Please send your patch and I try to apply it on Linux. Juha -- _______________________________________________ Lazarus mailing list http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus

-------------- next part --------------
A non-text attachment was scrubbed...
Name: patches.zip
Type: application/zip
Size: 3795 bytes
Desc: not available
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20130407/2c4c296e/attachment.zip>

Reply by email

Florian Klämpfl
to Lubos Pintes
Lubos Pintes wrote 12 lines
Patches attached. Also I had similar problem I described yesterday, I am sure I am doing something wrong. As usual (I think, not still very experienced git user), someone switches branches often, does pulls etc. So before I generated patches I just attached, git told me something like "cannot rebase, you have uncommitted changes", and that change was something like objinspstrconsts.cs.po. I am sure I didn't touch the file. So I stashed it, rebased and then generated patches. So what I am doing wrong? Who generates those .po files and when?

Sometimes makefiles regenerate .po etc. files and at least to my experience git sometimes does not recognize that those files are still binary equal and insists that they are changed.

Reply by email

Juha Manninen
to Lubos Pintes: Patches attached. Also I had similar problem I described yesterday, I am sure I am doing…
Lubos Pintes wrote
Patches attached.

They can be applied on Linux without problems.
You can go ahead attaching them to a bug report or whatever you plan to do.

Show quoted text 6 lines
"cannot rebase, you have uncommitted changes", and that change was something like objinspstrconsts.cs.po. I am sure I didn't touch the file. So I stashed it, rebased and then generated patches. So what I am doing wrong? Who generates those .po files and when?

They are generated automatically when you build Lazarus. You did the right thing by stashing them.
They will be committed to SVN, too, but preferably not mixed with other code changes.

Juha

Reply by email