www.digitalmars.com         C & C++   DMDScript  

digitalmars.D - Walter Bright please learn to rebase your commits

reply Andrej Mitrovic <andrej.mitrovich gmail.com> writes:
Your series of commits named "detab" and "ebook" have managed to
revert changes to dpl.org over 3 months old. Have a look:

https://github.com/D-Programming-Language/d-programming-language.org/commit/b4070b7a422d448e63d1425a778230d2602c522d

Before your changeset:
int[string] b;

After your changeset:
int[char[]] b;

You have effectively reversed my fixes introduced in pull 9:
https://github.com/D-Programming-Language/d-programming-language.org/pull/9

There are probably other commits which you've obliterated with these
commits as well.
Sep 07 2011
next sibling parent reply "Vladimir Panteleev" <vladimir thecybershadow.net> writes:
On Wed, 07 Sep 2011 14:50:17 +0300, Andrej Mitrovic  
<andrej.mitrovich gmail.com> wrote:


 Your series of commits named "detab" and "ebook" have managed to
 revert changes to dpl.org over 3 months old. Have a look:

 https://github.com/D-Programming-Language/d-programming-language.org/commit/b4070b7a422d448e63d1425a778230d2602c522d


That looks like a detab from a stale copy. What does rebasing have to do  
with this?

By the way, is the "detab" tool available? It could be useful for merging  
old patches with current versions that have been "detab"bed.

-- 
Best regards,
  Vladimir                            mailto:vladimir thecybershadow.net
Sep 07 2011
parent Andrej Mitrovic <andrej.mitrovich gmail.com> writes:
On 9/7/11, Vladimir Panteleev <vladimir thecybershadow.net> wrote:

 That looks like a detab from a stale copy. What does rebasing have to do
 with this?


Rebasing/merging/whatever. You know what I meant.
Sep 07 2011
prev sibling parent reply Walter Bright <newshound2 digitalmars.com> writes:
On 9/7/2011 4:50 AM, Andrej Mitrovic wrote:

 Your series of commits named "detab" and "ebook" have managed to
 revert changes to dpl.org over 3 months old. Have a look:

 https://github.com/D-Programming-Language/d-programming-language.org/commit/b4070b7a422d448e63d1425a778230d2602c522d

 Before your changeset:
 int[string] b;

 After your changeset:
 int[char[]] b;

 You have effectively reversed my fixes introduced in pull 9:
 https://github.com/D-Programming-Language/d-programming-language.org/pull/9

 There are probably other commits which you've obliterated with these
 commits as well.


Sorry about that. Will try to fix.
Sep 07 2011
parent Trass3r <un known.com> writes:
 Sorry about that. Will try to fix.


Hopefully this doesn't destroy the pull requests :)
Sep 07 2011