In message <[EMAIL PROTECTED]> on Sat, 30 Aug 2008 12:48:12 -0700, "Zack
Weinberg" <[EMAIL PROTECTED]> said:
zackw> "make distcheck" is failing because it can't find a rule to create
zackw> "mtnopt". This is a script which comes with the source tree; I tried
zackw> renaming it out of the util/ d
On Sun, Aug 31, 2008 at 4:19 PM, Felipe Contreras
<[EMAIL PROTECTED]> wrote:
> On Sun, Aug 31, 2008 at 3:55 PM, Stephen Leake
> <[EMAIL PROTECTED]> wrote:
>> "Felipe Contreras" <[EMAIL PROTECTED]> writes:
>>
>>> On Sun, Aug 31, 2008 at 9:24 AM, Patrick Georgi <[EMAIL PROTECTED]> wrote:
>>>
>>> The
On Mon, Sep 1, 2008 at 12:10 AM, Richard Levitte <[EMAIL PROTECTED]> wrote:
> "Zack Weinberg" <[EMAIL PROTECTED]> said:
> zackw> "make distcheck" is failing because it can't find a rule to create
> zackw> "mtnopt".
>
> I'll look into it. If you look in Makefile.am in the top directory,
> you can f
Zack Weinberg wrote:
> On Mon, Sep 1, 2008 at 12:10 AM, Richard Levitte <[EMAIL PROTECTED]>
wrote:
> > "Zack Weinberg" <[EMAIL PROTECTED]> said:
> > zackw> "make distcheck" is failing because it can't find a rule to create
> > zackw> "mtnopt".
> >
> > I'll look into it. If you look in Makefile.am
In specifying conflict resolutions, the user can specify a file that
contains the desired content.
I'd like to allow that file to either be in the workspace, or in the
bookkeeping area (or anywhere else, for that matter). That gives the
user maximum flexibility in designing a workflow.
However, I
On Mon, Sep 1, 2008 at 12:06 PM, Stephen Leake
<[EMAIL PROTECTED]> wrote:
> In specifying conflict resolutions, the user can specify a file that
> contains the desired content.
>
> I'd like to allow that file to either be in the workspace, or in the
> bookkeeping area (or anywhere else, for that ma
"Zack Weinberg" <[EMAIL PROTECTED]> writes:
> On Mon, Sep 1, 2008 at 12:06 PM, Stephen Leake
> <[EMAIL PROTECTED]> wrote:
>> In specifying conflict resolutions, the user can specify a file that
>> contains the desired content.
>>
>> I'd like to allow that file to either be in the workspace, or in
I've just committed db337bc730cc15eae78f94a423bc460823b07e0a.
It adds the command 'resolve_conflict' that sets the conflict
resolution for the first unresolved conflict in the conflict file.
There's a test for it, which isn't passing yet, because it's testing
conflict resolutions that are not yet
