[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: Losing information in *.rej
Date: Fri, 05 Mar 2004 00:30:26 -0500
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6b) Gecko/20031221 Thunderbird/0.4

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.

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 <>/tlacontrib--aba--1.2


reply via email to

[Prev in Thread] Current Thread [Next in Thread]