Cygwin checkout problem

[Adrian Wilkins]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> From: John Arbash Meinel <john at arbash-meinel.com>

> Sorry about the delay on this.
> 
> Phil Hudson wrote:
>> I'm having a lot of unexpected and unexplained problems getting a working
>> directory checked out in (at the same level as) my home directory under Cygwin.
>> It works on other OSes.
> 
>> I'm a newbie, starting out getting my home directory under Bazaar SCM (moving
>> from Perforce). I use a standard common subset of the files under my home
>> directory on all of MacOS (PPC and i386), debian (PPC and i386), Ubuntu (i386),
>> Cygwin, and Solaris (SPARC and i386).
> 
>> I've fetched Bazaar 1.5 on those systems whose package managers are up-to-date,
>> and built it on the others. Cygwin is one of the latter.
> 

Thoroughly recommend the 1.6 series over 1.5 on Windows, it's very noticeably
faster, particularly the rc2 build.

> 
> Just to mention, I use the win32 bzr while in the cygwin shell. It
> doesn't manage the executable bits, but it avoids all of the cygwin
> overhead.

If it's just about having a less crippled shell I use native win32 bzr (python
flavour) in Powershell. Powershell is really rather nice and certainly better
than cmd.exe once you get used to the encoding caveats (ie every string it emits
is Unicode unless you say otherwise). I like it better than bash, but that is
influenced by my relative experience level in PoSh vs bash.

> 
>> I've successfully set up a repo on machine A (Ubuntu) containing everything I
>> want from the old P4 repository. I've successfully pushed a branch locally.
> 
>> On each of my other machines, including the Cygwin one, I've successfully taken
>> a copy of that branch using the branch command and an sftp:// URI.
> 
>> On each of these machines, I then do a checkout from the local branch to my
>> actual home directory. On most of them, this has proceeded just as the Bazaar
>> doco had led me to expect: one or two conflicts, with conflicting files being
>> renamed for subsequent resolving.
> 
>> On Cygwin, however, almost all the files are reported as conflicting. I suspect
>> this is a CR/LF thing. Does Bazaar perhaps assume that if you're on W32 then you
>> always want CR/LF? (Perforce did -- I had similar problems running P4 under
>> Cygwin). However, the checkout fails ungracefully with a cryptic and vague error
>> message:
> 

Are they text conflicts, or other types? One of the nasties when using Win/Lin
on the same branch is the x-bit. Cygwin should be managing the x-bit, but if you
version files in a non x-bit-supporting filesystem on Linux, it globally sets
all the x-bits which is rather annoying.

>> bzr: ERROR: [Errno 13] Permission denied
> 
Don't know what's going on here without more detail. Although it's possible you
have a file open (or a directory) that bzr wants to futz with.

> 
> Bazaar doesn't assume CRLF, it doesn't change the line endings of files.

Cygwin, AFAIR, has install options which DO meddle with line endings though.

> 
> If you could run this again with "-Derror" it will give a full traceback
> of what happened. My best guess is something like encountering a
> directory that we can't rename, etc.
> 
>> None of the dozens of supposedly conflicting files has been renamed and none of
>> the new files has been copied into place. 

This again makes me think it's x-bits. Conflicts would usually either create
".moved" or BASE THIS OTHER files.

What does a diff say? Are the files actually different?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIpMaycP1uebIhWSYRAtIyAJ0RlUcw7fkOG/EH2fYehI4vKh27IQCfQUHj
jA8+LeFnNbcQQTGvvdj6jhE=
=2UTa
-----END PGP SIGNATURE-----