Hi all! A annoyance for me has always been that monotone can't switch to another workspace if it has to remove directories which are not present in the target revision and these directories contain unversioned files (f.e. editor backup files). monotone then bails out with "X workspace conflicts" and lets the user clean up his mess.
So I hacked something together last week or so, for which I want to get some feedback. The code resides in nvm.experiment.remove_leftover_files and essentially does the following: It introduces a new option --move-conflicting-paths for all workspace-update related commands (clone, checkout, update, merge_into_workspace) which then notices conflicting paths during the simulated working tree phase and moves these conflicting paths into _MTN/conflicts/DATETIME, where DATETIME is the current date/time stamp of the update operation. A user can then decide to restore them later on (the directory structure is preserved) or remove them by rm -rf _MTN/conflicts. I know that the naming of the directory currently conflicts with the upcoming conflicts work Stephe prepares, but I couldn't think of a better / shorter name. Still, suggestions are pretty much welcome. I think one could also name directory like the source revision from which the user switches from (and name it "base" or something in the "checkout into an existing directory case"). I haven't yet written tests for it, which I plan to do when the functionality finds support, but documentation is already in place. Opinions? Thomas. -- GPG-Key 0x160D1092 | [EMAIL PROTECTED] | http://thomaskeller.biz Please note that according to the EU law on data retention, information on every electronic information exchange might be retained for a period of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
