Re: Reindenting / Reformating (whitespace)
Larry McVoy <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
On Sun, Aug 29, 2004 at 08:09:13AM -0700, Eric Wing wrote: > I'm sorry, I must be wrong about the whitespace. On > trying it again, things do seem to be working. I must > have done something wrong before. OK, thanks, that's good to know. > As for the newline problem, attached is one of the s. > files I have that exhibit the problem. There seem to > be two ^M characters at the end of each line in my > actual file which seems to be confusing my VC > compiler. OK, I have a fix. The problem is that BK is trying to be clever about making sure that it doesn't check in changes that differ only in \r\n vs \n. How you managed to do this in the first place is a good question (do you know? Do you know the platform and BK version used to do the initial checkin?) We can fool BK into taking any diffs we want like so: bk get -kp $FILE > ORIG cp ORIG FIXED vi FIXED :%s/^V^M//g <- that's Control-V Control-M :wq diff ORIG FIXED > DIFFS bk get -eg $FILE bk delta -y'Fix \r' -DDIFFS $FILE Try that and see if that works for you. But more importantly try and figure out how this happened in the first place, this should not have happened, the code that went in to prevent this went in on 2000/11/13. It's very unlikely that you are using a BK which predates that, right? -- --- Larry McVoy lm at bitmover.com http://www.bitkeeper.com _______________________________________________ Bitkeeper-users mailing list [email protected] http://bitmover.com/mailman/listinfo/bitkeeper-users To unsubscribe from this list, go to the above URL, follow instruction at the bottom of the web page.