-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 06/23/2010 09:02 AM, Maris Fogels wrote: > My wording could have been clearer - they are not so much "accidental > additions" as "the re-addition causes a conflict". > > From what I can tell someone deletes the directory; I pull the change; > The directory gets removed from source control, but remains on disk; > Someone fixes it; I pull the re-addition; bzr renames 'apidoc' to > apidoc.moved', and gets a conflict (especially if this is the second or > third time conflicts have happened: apidoc.moved already exists! > Aaauuggghh! apidoc.moved.moved exists too!)
My experience is different. I pull, and bzr tries to delete my existing apidoc, but can't because it has contents, which is a conflict. It tries to create a new apidoc as part of the same pull, so it renames the existing apidoc to apidoc.moved. I can only assume that people are deleting and re-adding the directory, when instead they should use "bzr revert $DIRECTORY". So I thought they might be doing it by accident. Aaron -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkwiDNQACgkQ0F+nu1YWqI2AmACeL8HdDTDJz6aDhv5LKhGOIbik EcEAn36Q1ua35GI3OCl78O7VE4/7kghV =0BzE -----END PGP SIGNATURE----- _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
