[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] =partner-versions
From: |
Miles Bader |
Subject: |
Re: [Gnu-arch-users] =partner-versions |
Date: |
Mon, 31 May 2004 17:36:06 -0400 |
User-agent: |
Mutt/1.3.28i |
On Mon, May 31, 2004 at 05:09:21PM -0400, Aaron Bentley wrote:
> > -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
>
> 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.)
I'm not sure what you mean; _explicit_ conflicts (where a "C" gets printed)
always generates a .rej file as far as I know. Certainly the presence or
absence of .rej files has always been a reliable indicator in my experience.
Do you have a case in mind where it's not?
-Miles
--
Yo mama's so fat when she gets on an elevator it HAS to go down.
- Re: [Gnu-arch-users] Re: [MERGE REQUEST] changeset translation preparatory work, (continued)
- Re: [Gnu-arch-users] Re: [MERGE REQUEST] changeset translation preparatory work, Harald Meland, 2004/05/31
- [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Miles Bader, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Miles Bader, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Miles Bader, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Miles Bader, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions,
Miles Bader <=
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Miles Bader, 2004/05/31
- [Gnu-arch-users] Re: =partner-versions, Stefan Monnier, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Matthieu Moy, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Aaron Bentley, 2004/05/31
- Re: [Gnu-arch-users] =partner-versions, Matthieu Moy, 2004/05/31
- [Gnu-arch-users] Re: =partner-versions, Stefan Monnier, 2004/05/31
- [Gnu-arch-users] Re: [MERGE REQUEST] changeset translation preparatory work, Stefan Monnier, 2004/05/31
- Re: [Gnu-arch-users] Re: [MERGE REQUEST] changeset translation preparatory work, Jamie Wilkinson, 2004/05/30
- Re: [Gnu-arch-users] Re: [MERGE REQUEST] changeset translation preparatory work, Miles Bader, 2004/05/30