Re: [Gnu-arch-users] [BUG] renaming arch changelog panics arch on next pristine update

[Sylvain Defresne]

Hello,

> The actual archive this happened to is at
> http://arch.srvx.net/~entrope/arch-2004/, both the ircu--devo--2.10.12
> version and arch-bug--devo--0 (the second has fewer patches, so the
> problem is clearer).  I am using tla-1.2-3 from Debian sid.
> 
> The projects use implicit tagging and started with a non-arch
> ChangeLog file.  I decided to move that to another name and create an
> arch ChangeLog file in its place.  That worked as expected.  Then I
> realized it would probably be easier to keep the CVS and arch trees in
> sync if the _arch_ ChangeLog were named differently.  So I moved the
> arch changelog from ChangeLog to ChangeLog.arch, and moved the CVS
> changelog to ChangeLog.  When arch tries to build a pristine tree for
> that patch, it panics.
> 
> How I produced this behavior:
> 
> - To get base-0:
> cd ~/src
> mkdir arch-bug
> cd arch-bug
> tla archive-setup arch-bug--devo--0
> tla init-tree arch-bug--devo--0
> echo "This is not an arch ChangeLog." > ChangeLog
> tla add ChangeLog
> tla import
> 
> - To get patch-1:
> tla mv ChangeLog ChangeLog.other
> tla changelog > ChangeLog
> cat ChangeLog
> tla add -i "address@hidden/arch-bug--devo--0" ChangeLog
> tla make-log
> tla commit
> 
> - To get patch-2:
> tla mv ChangeLog ChangeLog.arch
> tla mv ChangeLog.other ChangeLog
> tla make-log
> tla commit
> 
> That "tla commit" displays these lines and exits:
> 
> * update pristine tree (address@hidden/arch-bug--devo--0--patch-1 => 
> arch-bug--devo--0--patch-2)
> Error calling `vu_lstat' for 
> "/home/mdpoole/src/arch-bug/,,address@hidden/arch-bug--devo--0--patch-2.patches/removed-files-archive/./ChangeLog"
>  (No such file or directory)
> PANIC: I/O error

This appear to be similar to bug #96 that I for which I provided a patch
some time ago (but it is not yet integrated). Could you please try the
the following patch and see if it correct the problem ...

--- orig/libarch/commit.c
+++ mod/libarch/commit.c
@@ -327,7 +327,7 @@
 
   if (changelog_mod_loc && changelog_orig_loc)
     {
-      changelog_diffs_fd = arch_changeset_add_diffs (&csr, &make_report, 
changeset_path, changelog_mod_loc, changelog_orig_loc, changelog_id);
+      changelog_diffs_fd = arch_changeset_add_diffs (&csr, &make_report, 
changeset_path, changelog_orig_loc, changelog_mod_loc, changelog_id);
     }
   else if (changelog_mod_loc)
     {

-- 
Sylvain Defresne                               <address@hidden>
1024D/A036DDB1 6AB9 B65F 7C44 819F DD42  62D2 A093 2840 A036 DDB1

signature.asc
Description: Ceci est une partie de message numériquement signée.