Gammon Forum : MUSHclient : Development : Problem with text view

Entire forum ➜ MUSHclient ➜ Development ➜ Problem with text view

Problem with text view

It is now over 60 days since the last post. This thread is closed. Refresh page

Pages: 1 2 3 4 5 6

Posted by

Twisol USA (2,257 posts) Bio

Date

Reply #75 on Fri 01 Oct 2010 01:08 AM (UTC)

Message

I see no inconsistency with Worstje's remarks. He's arguing against dividing changes. You tend re-implement changes instead of consolidating them, and Worstje is saying he'd prefer to consolidate his theming changes in the official repository. When it's not consolidated, and the split-off features have to be merged with every future change, it creates a lot of managerial overhead. But if everyone's on the same page, there's just the one-time cost of consolidating the changes.

'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol

Top

Posted by

Nick Gammon Australia (23,158 posts) Bio Forum Administrator

Date

Reply #76 on Fri 01 Oct 2010 01:11 AM (UTC)

Message

All I am saying is that I can't always get Git to work in the way I expect - same as him.

So rather than doing nothing, or spending hours working out why, and possibly corrupting my copy, I look at the changes and see a handful of lines that need to be copied and pasted, and do that.

- Nick Gammon

www.gammon.com.au, www.mushclient.com

Top

Posted by

Twisol USA (2,257 posts) Bio

Date

Reply #77 on Fri 01 Oct 2010 01:28 AM (UTC)

Amended on Fri 01 Oct 2010 01:30 AM (UTC) by Twisol

Message

Not to imply anything, but there are tons of open-source projects that don't seem to have that problem. And not to put words in his mouth, but I think the problem is dealing with the conflicts, not forcing Git to do what you want.

If there's any specific issue you have with Git, I'm more than happy to (try to) help... :)

[EDIT]: As for corrupting your copy... I mentioned in my original t_regexp pull request that you can just create a new git branch and pull the changes into it, to give them a test drive separately from your master branch.

'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol

Top

Posted by

Worstje Netherlands (899 posts) Bio

Date

Reply #78 on Fri 01 Oct 2010 01:56 AM (UTC)

Message

Nick Gammon said:

So without wanting to sound too snaky, you ask why I don't just do things the "Git way" but admit that you yourself have problems doing just that.

So please bear with me when I seem to cut and paste for no apparent reason, rather than just re-applying your commits.

Exactly, I have problems. I am human, and fully blame myself for being imperfect. Now, let's offset things a little...

I downloaded git for the first time on September 15, which is also the day I got my first taste of it. That's basically a good two weeks, three if you want to round upwards. During that time, I made my first steps into the MUSHclient source, wrote my first patches and did the research and debugging I needed to get done.

Git was written for busy busy projects with tons of merges, reverses, branching and so forth - the Linux kernel being the need of its creation. Thus, I assume git has good merging facilities, together with everything else one might expect, and so far it has not let me down. My own knowledge has been my limiting factor thus far, and I will work on improving that as I get more experience with the tool.

Do I expect you to be a git wizard? No. But as a project 'leader', do I expect you to go out of your way to do things manually that it can do for you with a bit of research, skipping the many errorprone actions that might result? I have only argued for the removal of human error, and the constant PMs/posts/notifications to you that you might have done something wrong. I know I'd hate it if people pointed out my mistakes every commit or two, so instead I try to offer a way in which you spend less time correcting, and as a result, spend less time getting annoyed with me as being the dude that always points out your mistakes.

Now, at this time my ability to merge this stuff from your branch with my theming each time manually causes me to have to re-merge on every subsequent pull. Yeah, I am horrible for not having figured all the details out yet, but it isn't as if there isn't a better alternative: leaving the code in as it was since it is not going to break anything, and to boot, anyone else who wants to build with a modern environment can have the added functionality.

And everything Twisol says is what I also feel - he just writes a bit more concise and less defensively than I do. :)

Top

Posted by

Nick Gammon Australia (23,158 posts) Bio Forum Administrator

Date

Reply #79 on Fri 01 Oct 2010 01:58 AM (UTC)

Message

Twisol said:

If there's any specific issue you have with Git, I'm more than happy to (try to) help... :)

Worstje said:

The last few times I attempted to merge my theming changes with your master I kept getting merge conflicts for every single time I tried to 'sync' up with your branch.

Twisol - how about helping Worste to do his merge?

- Nick Gammon

www.gammon.com.au, www.mushclient.com

Top

Posted by

Twisol USA (2,257 posts) Bio

Date

Reply #80 on Fri 01 Oct 2010 02:02 AM (UTC)

Amended on Fri 01 Oct 2010 02:04 AM (UTC) by Twisol

Message

Nick Gammon said:
Twisol - how about helping Worste to do his merge?

If there are conflicts, there are conflicts. There's not much I can do about that. This is the reason I abandoned my 'old' branch.

'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol

Top

Posted by

Nick Gammon Australia (23,158 posts) Bio Forum Administrator

Date

Reply #81 on Fri 01 Oct 2010 03:24 AM (UTC)

Message

You made major changes and re-arranged stuff. He just wants to add a few lines of code.

- Nick Gammon

www.gammon.com.au, www.mushclient.com

Top

Posted by

Twisol USA (2,257 posts) Bio

Date

Reply #82 on Fri 01 Oct 2010 03:26 AM (UTC)

Message

I know. But if there are conflicts, Git must be unable to merge the changes without breaking something. It's not a matter of figuring out how to make Git do something, it's a matter of Git telling us it can't do something automatically. :|

'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol

Top

Posted by

Nick Gammon Australia (23,158 posts) Bio Forum Administrator

Date

Reply #83 on Fri 01 Oct 2010 05:57 AM (UTC)

Message

Have you tried to resolve the merge problems that Worstje is having or not? Or are you just speculating it can't be done?

- Nick Gammon

www.gammon.com.au, www.mushclient.com

Top

Posted by

Twisol USA (2,257 posts) Bio

Date

Reply #84 on Fri 01 Oct 2010 06:34 AM (UTC)

Message

We've talked briefly, but semi-speculating. He told me that the conflicts can be resolved, which makes sense (of course). The problem is that he had to re-fix the same conflicts after he pulled in the next set of changes from you. This would happen if you touched the same conflicting code again, but I don't see anything particularly odd in his network graph. I think it might have been around the time when you pulled in Worstje's theming changes, then reverted the majority of them, but I can't really say for sure.

'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol

Top

The dates and times for posts above are shown in Universal Co-ordinated Time (UTC).

To show them in your local time you can join the forum, and then set the 'time correction' field in your profile to the number of hours difference between your location and UTC time.

228,066 views.

This is page 6, subject is 6 pages long: 1 2 3 4 5 6

It is now over 60 days since the last post. This thread is closed. Refresh page

Go to topic: Search the forum

top