git misery

Pete Mack · February 6, 2011, 05:33

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?

Nick · February 6, 2011, 05:34

Use linux

Nick · February 6, 2011, 05:36

Seriously, no, I'm afraid - I haven't got a good Windows git client yet, but I haven't really been trying.

zaimoni · February 6, 2011, 05:47

If you have vim installed (like I do), use it to smash the line endings into the non-conflicted form.

Derakon · February 6, 2011, 06:20

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.

Pete Mack · February 6, 2011, 06:23

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

d_m · February 6, 2011, 06:35

Quote:

Originally Posted by Pete Mack

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/

Pete Mack · February 6, 2011, 07:00

@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.

Nick · February 6, 2011, 07:25

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

Pete Mack · February 6, 2011, 08:42

@Nick --
That's crazy. I just want to keep a local copy up to date.
What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes.

Code:

svn update
svn revert <things that update complains about>
svn update

February 6, 2011, 05:33	#1
Pete Mack Prophet Join Date: Apr 2007 Location: Seattle, WA Posts: 5,967 Donated: $40	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?

February 6, 2011, 05:34	#2
Nick Vanilla maintainer Join Date: Apr 2007 Location: Canberra, Australia Age: 55 Posts: 8,638 Donated: $60	Use linux __________________ One for the Dark Lord on his dark throne In the Land of Mordor where the Shadows lie.

February 6, 2011, 05:36	#3
Nick Vanilla maintainer Join Date: Apr 2007 Location: Canberra, Australia Age: 55 Posts: 8,638 Donated: $60	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.

February 6, 2011, 05:47	#4
zaimoni Knight Join Date: Apr 2007 Posts: 590	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

February 6, 2011, 07:25	#9
Nick Vanilla maintainer Join Date: Apr 2007 Location: Canberra, Australia Age: 55 Posts: 8,638 Donated: $60	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.

February 6, 2011, 06:20	#5
Derakon Prophet Join Date: Dec 2009 Posts: 9,024	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.

February 6, 2011, 06:23	#6
Pete Mack Prophet Join Date: Apr 2007 Location: Seattle, WA Posts: 5,967 Donated: $40	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

February 6, 2011, 07:00	#8
Pete Mack Prophet Join Date: Apr 2007 Location: Seattle, WA Posts: 5,967 Donated: $40	@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.

February 6, 2011, 08:42	#10
Pete Mack Prophet Join Date: Apr 2007 Location: Seattle, WA Posts: 5,967 Donated: $40	@Nick -- That's crazy. I just want to keep a local copy up to date. What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes. Code: svn update svn revert <things that update complains about> svn update

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

Thread Tools
Show Printable Version Email this Page
Display Modes
Switch to Linear Mode Hybrid Mode Switch to Threaded Mode

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