Dear diary, on Thu, Jul 27, 2006 at 01:03:30AM CEST, I got a letter
where Jon Smirl <jonsmirl@xxxxxxxxx> said that...
> This is a simpler sequence
>
> cg clone git foo
> cg clone git foo1
> cd foo
> mkdir zzz
> git mv gitweb zzz
> cg diff >patch
> cg ../foo1
> cg patch <../foo/patch
Even simpler one:
mkdir zzz
cg-mv gitweb zzz
cg-diff | cg-patch -R
(which would even undo the mess supposing that it worked properly)
> [jonsmirl@jonsmirl foo1]$ cg patch <../foo/patch
> mv: cannot move `gitweb/README' to `zzz/gitweb/README': No such file
> or directory
Oops. Thanks, fixed with this:
diff --git a/cg-patch b/cg-patch
index cc82f1f..923df0e 100755
--- a/cg-patch
+++ b/cg-patch
@@ -145,6 +145,8 @@ redzone_border()
echo "$file1: rename destination $file2 already exists, NOT RENAMING" >&2
return
fi
+ # FIXME: Remove stale empty directories related to $mvfrom
+ case $mvto in */*) mkdir -p "${mvto%/*}";; esac
mv "$mvfrom" "$mvto"
fi
if [ "$op" = "delete" -o "$op" = "rename" ]; then
> mv: cannot stat `"gitweb/test/M\\303\\244rchen"': No such file or directory
Junio, how am I supposed to unmangle this *censored* stuff?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html