Attached is a patch that does the right thing when working with mergeWithUpstream and an archive with files at the top level of the archive. Note that the logic was borrowed directly from uupdate.
I would love to see this integrated soon, as I have several repositories that are afflicted by the lack of this support. thanks, Charles -- The millionth man Has joined Our ranks Of happy shavers Many thanks! Burma-Shave http://burma-shave.org/jingles/1933/the_millionth_man
--- /usr/bin/svn-buildpackage 2005-09-17 07:42:03.000000000 -0400
+++ svn-buildpackage 2005-09-17 08:03:41.000000000 -0400
@@ -375,7 +375,15 @@
}
else {
withecho "tar", "zxf", $origfile, "-C", "$ba/tmp-$mod";
- withecho "mv", (<$ba/tmp-$mod/*>), $bdir;
+ my @entries = (<$ba/tmp-$mod/*>);
+ if (@entries == 1) {
+ # The files are stored in the archive under a top directory, we
presume
+ withecho "mv", (<$ba/tmp-$mod/*>), $bdir;
+ }
+ else {
+ # Otherwise, we put them into a new directory
+ withecho "mv", "$ba/tmp-$mod", $bdir;
+ }
}
if($opt_nolinks || $opt_ignnew) {
withecho ("svn", "--force", "export", $$c{"trunkDir"},"$bdir");
signature.asc
Description: Digital signature
