TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-11-28 23:20:43 +00:00
parent c7566dd995
commit 3bfe01c424
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandatool/src/softprogs/softCVS.cxx
View File

@ -343,13 +343,17 @@ rename_file(SoftCVS::SceneFiles::iterator begin,
Filename file((*p).get_dirname(), (*p).get_filename()); Filename file((*p).get_dirname(), (*p).get_filename());
if (!file.unlink()) { if (!file.unlink()) {
nout << "Unable to remove " << file << ".\n"; nout << "Unable to remove " << file << ".\n";
} else if ((*p).is_1_0()) { } else {
cvs_has_1_0 = true; if ((*p).get_in_cvs()) {
if ((*p).is_1_0()) {
// We don't cvs remove the 1.0 version. // We don't cvs remove the 1.0 version.
cvs_has_1_0 = true;
} else { } else {
_cvs_remove.push_back(file); _cvs_remove.push_back(file);
} }
} }
}
}
// And rename the good one. // And rename the good one.
Filename source(dirname, source_filename); Filename source(dirname, source_filename);
@ -364,11 +368,14 @@ rename_file(SoftCVS::SceneFiles::iterator begin,
// We do have to cvs remove the old one. // We do have to cvs remove the old one.
_cvs_remove.push_back(source); _cvs_remove.push_back(source);
} }
if (!cvs_has_1_0) { if (!cvs_has_1_0) {
// And we have to cvs add the new one. // And we have to cvs add the new one.
_cvs_add.push_back(dest); _cvs_add.push_back(dest);
} }
orig.set_in_cvs(true);
return true; return true;
} }