Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old February 6, 2011, 05:33   #1
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,475
Donated: $40
Pete Mack is on a distinguished road
git misery

I just tried to pull the latest changes in angbandbase, and got conflict errors for every single file. It looks like a UNIX/WINDOWS EOL problem.
Any suggestions on how to fix it, with either the UI or the command line?
Pete Mack is online now   Reply With Quote
Old February 6, 2011, 05:34   #2
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,910
Donated: $60
Nick will become famous soon enough
Use linux
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old February 6, 2011, 05:36   #3
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,910
Donated: $60
Nick will become famous soon enough
Seriously, no, I'm afraid - I haven't got a good Windows git client yet, but I haven't really been trying.
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old February 6, 2011, 05:47   #4
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 39
Posts: 1,516
d_m is on a distinguished road
Quote:
Originally Posted by Pete Mack View Post
I just tried to pull the latest changes in angbandbase, and got conflict errors for every single file. It looks like a UNIX/WINDOWS EOL problem.
Any suggestions on how to fix it, with either the UI or the command line?
Pete, what editor on Windows are you using?

One thing to try is to use an editor which can save unix line endings, try saving the affected files with different line endings and see how that works.

Can you tell if the problem is that you have locally changed the endings on a bunch of lines, or if the remote source (i.e. Nick) has changed the endings on a bunch of lines?
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old February 6, 2011, 05:47   #5
zaimoni
Knight
 
zaimoni's Avatar
 
Join Date: Apr 2007
Posts: 590
zaimoni is on a distinguished road
If you have vim installed (like I do), use it to smash the line endings into the non-conflicted form.
__________________
Zaiband: end the "I shouldn't have survived that" experience. V3.0.6 fork on Hg.
Zaiband 3.0.10 ETA Mar. 7 2011 (Yes, schedule slipped. Latest testing indicates not enough assert() calls to allow release.)
Z.C++: pre-alpha C/C++ compiler system (usable preprocessor). Also on Hg. Z.C++ 0.0.10 ETA December 31 2011
zaimoni is offline   Reply With Quote
Old February 6, 2011, 06:20   #6
Derakon
Prophet
 
Derakon's Avatar
 
Join Date: Dec 2009
Posts: 8,963
Derakon is on a distinguished road
I believe the desired vim command is

:%s/^v^m//

Where ^v should be interpreted as "control + v" and ^m as "control + m".

At least, that's what I've used in the past when poking at the NPPAngband source, and I'm pretty certain that the NPP devs are using Windows.
Derakon is online now   Reply With Quote
Old February 6, 2011, 06:23   #7
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,475
Donated: $40
Pete Mack is on a distinguished road
I understand all that, and I am using vim for that reason, but it's complaining about files I never even edited!
Grrr....
I never had problems like this with svn or even cvs
Pete Mack is online now   Reply With Quote
Old February 6, 2011, 06:35   #8
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 39
Posts: 1,516
d_m is on a distinguished road
Quote:
Originally Posted by Pete Mack View Post
I understand all that, and I am using vim for that reason, but it's complaining about files I never even edited!
Grrr....
I never had problems like this with svn or even cvs
Maybe this will help?

http://help.github.com/dealing-with-lineendings/
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old February 6, 2011, 07:00   #9
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,475
Donated: $40
Pete Mack is on a distinguished road
@d_m
That's better, but I am still getting errors.

What's the correct command for syncing with source?
Once I figure this stuff out, I'm going to blow away my entire tree, then start over.
Pete Mack is online now   Reply With Quote
Old February 6, 2011, 07:25   #10
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 54
Posts: 7,910
Donated: $60
Nick will become famous soon enough
If you're going to blow it all away anyway, I'd recommend making your own fork of angband/angband on github, then cloning that locally. takkaria has just updated the instructions for usehere - written in small words for people like me
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
Moving to Git takkaria Development 57 December 4, 2010 10:22
Vanilla, Trac, Git, etc. takkaria Development 2 November 2, 2010 14:52
Bug in current vanilla, Git? Trac? Timo Pietilš Development 4 October 10, 2010 22:12
Sangband SVN/Git/? camlost Development 7 September 9, 2010 19:31
Threaded view misery Magnate Oook! 3 November 29, 2009 17:36


All times are GMT +1. The time now is 17:53.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2020, vBulletin Solutions Inc.