Re: [Gnu-arch-users] Re: Losing information in *.rej

[Aaron Bentley]

Andreas Rottmann wrote:

> Stefan Monnier <address@hidden> writes:
>
>  
>
> > I've just gone through a `tla replay' that replaced a bunch of non-resolved
> > .rej files with others and it's pretty messy now.  Maybe you'll say I was
> > an idiot and tla shouldn't prevent me from shooting my own foot, but at
> > least former CVS users will appreciate.  Along the same lines `tla changes'
> > might list files with pending .rej files as `C' to indicate that they have
> > unresolved conflicts.
> >
> >    
> I'd like that behaviour, too. I often find myself doing a 'find -name
> "*.rej"'. If 'tla changes' would list those as conflicts, it would
> make this step redundant.
>
> Andy
>  
If it's any help to you, I've added a "conflicts" command to aba that 
lists files which have .rej or .orig counterparts.  You can also use its 
return value to write "replay" or "changes" wrappers that refuse to 
operate on trees containing conflicts.

address@hidden 
<http://mirrors.sourcecontrol.net/%7Eabentley/archives/tlasrc/>/tlacontrib--aba--1.2
http://mirrors.sourcecontrol.net/~abentley/archives/tlasrc/

Aaron