Re: [Gnu-arch-users] merge conflicts

[John Meinel]

Zenaan Harkness wrote:
> On Fri, 2004-10-08 at 13:03, John Meinel wrote:
[...]
> Excellent, thanks. Works well...
>
> I never realised from all the docs (-H, wiki, tut?) that this is what
> --three-way was for - I thought it was an extra special type of merge
> that would help me in bizzarre situations.
>
>
> > The reason it isn't the default is that it is really easy to commit one 
> > of these conflicted files, which is *not* what you want to do.
>
>
> Exactly.
>
> Does/ can "commit" balk out if it finds .rej files? (This is not
> something I want to test on my stable tree :)

I believe the default is for tla to ignore .rej files. If you look in 
=tagging-method they are defined as "backup".

I believe if you move them into unrecognized then tla will not commit as 
long as they are around. To give a specific example, the current default 
regex's in =tagging-method are:

backup 
^.*(~|\.~[0-9]+~|\.bak|\.swp|\.orig|\.rej|\.original|\.modified|\.reject)$
unrecognized ^(.*\.(o|a|so|core|so(\.[[:digit:]]+)*)|core)$

If you modify these to:
backup ^.*(~|\.~[0-9]+~|\.bak|\.swp|\.original|\.modified|\.reject)$
unrecognized ^(.*\.(rej|orig|o|a|so|core|so(\.[[:digit:]]+)*)|core)$

Then tla should abort a commit when they are present.

>
[...]

> Double bonus with fabulous Gold Member stars! Groovin' baby, Yeah!
>
> Eh..hmm... got a bit carried away there...
>
> cheers
> zen
No problem.

As a side note, I think I've heard that star-merge --three-way will also 
create empty .rej files just to make it obvious what files conflicted. 
Is this still true?

John
=:->

signature.asc
Description: OpenPGP digital signature