Re: Reindenting / Reformating (whitespace)
Eric Wing <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
I'm still not sure how it happened. I'm not sure who's directly responsible for committing those changes within my group either (since the revision diffs won't display this data). But my guess is that 1 of 3 things happened (or some permutation) 1) We have some dual boot Windows/Linux machines. It is possible that the file was checked out in one of the environments, and then modified in another. Then it may have either been checked in there, or back in the original environment. 2) We have some network mounted drives with heterogenous systems accessing them. (Windows, Linux, OS X). It is possible that a file was checked out on a computer serving a network mount (say Linux), but was then modified by another computer (say Windows). 3) It is possible that a file was copied out from a repository to be worked on by somebody that didn't have respository access. This file may have been checked out on a Linux or OS X machine, transfered to a USB key or CD-ROM, edited on a Windows machine, and then copied back to a machine with repository access to be checked in. Now in the latest version of Bitkeeper, will this not happen anymore? Or do I still need to worry about this happening, and if so, and under the assumption that I can't do anything about these 3 things, is there something I can do to Bitkeeper to avoid these issues? Thanks, Eric --- Wayne Scott <[email protected]> wrote: > From: Larry McVoy <[email protected]> > > 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? > > We know how he did it. It was an old bug that was > fixed with a recent > version. Larry sent the correct method to repair > the problem. > > -Wayne > _______________________________________________ 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.