[ jEdit-devel ] i made a bad commit, should I really revert it?

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[ jEdit-devel ] i made a bad commit, should I really revert it?

Jarekczek
Administrator
I intended to change only eol-style attribute. Seems like the files that
where in Windows line ending mode get totally replaced with Unix eols. I
unintentionally became author of these files. I apologize for that.

If you guys think I should revert the repository to its original state,
please say so. There is a way to revert using svnadmin dump/load.

About 30 files are affected, those with "text changed" link in:
http://jedit.svn.sourceforge.net/viewvc/jedit?view=revision&revision=21971

Jarek


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|

Re: [ jEdit-devel ] i made a bad commit, should I really revert it?

Alan Ezust-3
Administrator
I believe that could be a deliberate side-effect of setting eol-style=native -
it converts line-endings on disk to something consistent and then does
the mapping/unmapping
when it reads/writes to your working directory.

So don't revert yet, it might be you fixed inconsistencies by doing that.


On Thu, Aug 2, 2012 at 1:53 PM, Jarek Czekalski
<[hidden email]> wrote:

> I intended to change only eol-style attribute. Seems like the files that
> where in Windows line ending mode get totally replaced with Unix eols. I
> unintentionally became author of these files. I apologize for that.
>
> If you guys think I should revert the repository to its original state,
> please say so. There is a way to revert using svnadmin dump/load.
>
> About 30 files are affected, those with "text changed" link in:
> http://jedit.svn.sourceforge.net/viewvc/jedit?view=revision&revision=21971
>
> Jarek
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> --
> -----------------------------------------------
> jEdit Developers' List
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/jedit-devel

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|

Re: [ jEdit-devel ] i made a bad commit, should I really revert it?

Kazutoshi Satoda
Administrator
In reply to this post by Jarekczek
Jarek Czekalski wrote:
> I intended to change only eol-style attribute. Seems like the files that
> where in Windows line ending mode get totally replaced with Unix eols. I
> unintentionally became author of these files. I apologize for that.

As Alan said, the changes are required to set svn:eol-style, AFAIK.

If you are worrying about svn blame, the original authors can still be
found with
   $ svn blame -x "--ignore-eol-style" ...
.

--
k_satoda

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|

Re: [ jEdit-devel ] i made a bad commit, should I really revert it?

Jarekczek
Administrator

W dniu 2012-08-03 02:20, Kazutoshi Satoda pisze:

> Jarek Czekalski wrote:
>> I intended to change only eol-style attribute. Seems like the files that
>> where in Windows line ending mode get totally replaced with Unix eols. I
>> unintentionally became author of these files. I apologize for that.
>
> As Alan said, the changes are required to set svn:eol-style, AFAIK.
>
> If you are worrying about svn blame, the original authors can still be
> found with
>   $ svn blame -x "--ignore-eol-style" ...
> .
>

Kazutoshi, this is great. That was my main concern and you made my day.

Jarek

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|

Re: [ jEdit-devel ] i made a bad commit, should I really revert it?

Alan Ezust-3
Administrator
In reply to this post by Jarekczek
Hi Jarek,

There is something else wrong with that 21971 commit.
I notice now there is a file/option pane for the File System Browser options,
BrowserContextOptionPane.java
There is an "include customize this menu link" checkbox.
I tried un-checking it and it changes the behavior of the main
EditPane context menu, not
that of the file system browser.
This entire file seems to be a mistake.

--Alan


On Thu, Aug 2, 2012 at 1:53 PM, Jarek Czekalski
<[hidden email]> wrote:

> I intended to change only eol-style attribute. Seems like the files that
> where in Windows line ending mode get totally replaced with Unix eols. I
> unintentionally became author of these files. I apologize for that.
>
> If you guys think I should revert the repository to its original state,
> please say so. There is a way to revert using svnadmin dump/load.
>
> About 30 files are affected, those with "text changed" link in:
> http://jedit.svn.sourceforge.net/viewvc/jedit?view=revision&revision=21971
>
> Jarek
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> --
> -----------------------------------------------
> jEdit Developers' List
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/jedit-devel

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel
Reply | Threaded
Open this post in threaded view
|

Re: [ jEdit-devel ] i made a bad commit, should I really revert it?

Jarekczek
Administrator
Hi Alan

Could you show me 1 difference between those files? I don't see any. And
please check former revision, 21970. Does it remove the problem? Not on
my side.

Jarek

W dniu 2012-08-05 22:07, Alan Ezust pisze:

> Hi Jarek,
>
> There is something else wrong with that 21971 commit.
> I notice now there is a file/option pane for the File System Browser options,
> BrowserContextOptionPane.java
> There is an "include customize this menu link" checkbox.
> I tried un-checking it and it changes the behavior of the main
> EditPane context menu, not
> that of the file system browser.
> This entire file seems to be a mistake.
>
> --Alan
>
>
> On Thu, Aug 2, 2012 at 1:53 PM, Jarek Czekalski
> <[hidden email]> wrote:
>> I intended to change only eol-style attribute. Seems like the files that
>> where in Windows line ending mode get totally replaced with Unix eols. I
>> unintentionally became author of these files. I apologize for that.
>>
>> If you guys think I should revert the repository to its original state,
>> please say so. There is a way to revert using svnadmin dump/load.
>>
>> About 30 files are affected, those with "text changed" link in:
>> http://jedit.svn.sourceforge.net/viewvc/jedit?view=revision&revision=21971
>>
>> Jarek
>>
>>
>> ------------------------------------------------------------------------------
>> Live Security Virtual Conference
>> Exclusive live event will cover all the ways today's security and
>> threat landscape has changed and how IT managers can respond. Discussions
>> will include endpoint security, mobile security and the latest in malware
>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>> --
>> -----------------------------------------------
>> jEdit Developers' List
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/jedit-devel



------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
-----------------------------------------------
jEdit Developers' List
[hidden email]
https://lists.sourceforge.net/lists/listinfo/jedit-devel