Re: [Gnu-arch-users] Conflict files in {arch}

[Yann Droneaud]

Aaron Bentley <address@hidden> writes:

> Yann Droneaud wrote:
>
>> I don't see that as a bug,
>> but is there a chance to add a fix to prevent stupid user adding
>> conflict files to an archive ?
>
> To prevent .rej and .orig files from being added, mark them as
> non-source or unrecognized.  (using =taggging-method)
>

The default backup doesn't apply correctly to {arch} directory.

backup 
^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.rej|\.original|\.modified|\.reject)$

And changing the unrecognized doesn't help

unrecognized ^(.*\.(rej|orig|o|a|so|core|so(\.[[:digit:]]+)*)|core)$

Just after I changed the unrecognized line, i made another commit:

address@hidden:/tmp/tla/tata $
/home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla commit -s "Added one
more time"
A  {arch}/=tagging-method.orig
A  {arch}/=tagging-method.rej
M  {arch}/=tagging-method
* committed address@hidden/tata--main--1.0--patch-3

The .orig and .rej are still marked as added.

address@hidden:/tmp/tla/tata $
/home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla changes        
* looking for address@hidden/tata--main--1.0--patch-3 to
compare with
* comparing to address@hidden/tata--main--1.0--patch-3
A  {arch}/=tagging-method.orig
A  {arch}/=tagging-method.rej

address@hidden:/tmp/tla/tata $
/home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla commit -s "Added
more conflict files"
A  {arch}/=tagging-method.orig
A  {arch}/=tagging-method.rej
* committed address@hidden/tata--main--1.0--patch-4

And, in fact, _there are never added to the archive_.
I did check the patch-log this time, and there are never added,
but reported as added by tla commit/change (and not silently discarded
by commit).

Sounds more like a bug now.

-- 
Yann Droneaud (aka Meuh) <address@hidden>
http://meuh.org/ | http://sherkan.tuxfamily.net/~meuh/
Une vache perdue sur Internet | A cow lost in the Internet
1024D/BEA43321   5D91 B5B0 5137 B8FE 6882  FE19 CAA0 6F05 BEA4 3321