Re: [Gnu-arch-users] =partner-versions

[Aaron Bentley]

Miles Bader wrote:
> On Mon, May 31, 2004 at 04:42:02PM -0400, Aaron Bentley wrote:
>
> For tla-partner, I thinking of something like this:
>
>   -C, --until-conflict    Stop when a tree conflict is detected
>   -c, --until-change      Stop when a the tree is a modified state
>   -f, --until-failure     Stop when a command returns a non-zero exit status
>
> Then for my `mess merging' I could just do:
>
>    tla-partner --until-conflict star-merge -t
>
> But people that want to be more careful would use `--until-change'.
>
> For other commands like `missing' of course, you never want it to stop.

I don't think you can go 'until-conflict' because there's no general way 
of detecting conflicts.  (As you well, know, they don't always generate 
.rej or .orig files.)  You can detect the exit status of merge commands, 
but that just takes you back to --until-failure.

To be honest, I'm not sure about this.  I think merge commands return 0 
if they did nothing, 1 if they did something, and 2 if there were conflicts.

Aaron
--
Aaron Bentley
Director of Technology
Panometrics, Inc.