Mail Archives: cygwin-developers/2002/09/20/18:15:48
--=-nj8RW2Xjr8UgK8w1qrMZ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Sat, 2002-09-21 at 08:05, Conrad Scott wrote:
> "Robert Collins" <rbcollins AT cygwin DOT com> wrote:
> > CVS is only atomic on single directories. So changes
> > to include/sys and include/cygwin will not be identifiable
> > as a single commit anyway.
>=20
> Main point accepted but it would show up as a single action in the
> cygwin-cvs mail archives.
>=20
> > Secondly, as long as you are quick about whatever you're doing,
> > a -D based diff will get the full set of changes.
>=20
> True again but speed is something I'm not sure I can guarantee: I get
> all paranoid at check-in time and everything seems to take forever.
>=20
> > Lastly, I don't understand the problem - you want HEAD to look
> > like cygserver right?
> [snip]
> > That should handle file renames and deletes seamlessly.
>=20
> It's now very clear that it's me who doesn't understand the problem :-)
>=20
> Okay, so all I need to do is move the files around in the branch to the
> suggested arrangement and then the patch will (by the magic of cvs) sort
> it all out for me. Glorious news and easier than I was assuming it
> would be.
Be sure to review the results of cvsmkpatch carefully. Oh, and do a
cvsmerge HEAD before the cvsmkpatch. That will give you the best
results.
How to tell it's done the right thing? The old files in HEAD will shwo
up as patches that remove everything, and the new files will be single
blocks with everything in them.
Also, I like to do a cvs -z3 diff -up after patching, before checking
in.
Cheers,
Rob
--=-nj8RW2Xjr8UgK8w1qrMZ
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQA9i54wI5+kQ8LJcoIRAt+CAJ9vRdO13cRcOwyb9hp+YGoASpv7YgCfZwG+
ln0EuJJu0AhAwjtVcHs6nGk=
=E8uc
-----END PGP SIGNATURE-----
--=-nj8RW2Xjr8UgK8w1qrMZ--
- Raw text -