Darcs says:

We have conflicts in the following files:
./darcsweb/darcsweb.py
Merging file ./darcsweb/darcsweb.py by hand.
Running command 'emerge3 [...]/version1/./darcsweb/darcsweb.py
[...]/version2/./darcsweb/darcsweb.py [...]/ancestor/./darcsweb/darcsweb.py
[...]/merged/./darcsweb/darcsweb.py'

the problem is, {version1,ancestor}/darcsweb/darcsweb.py does not exist -- that
file is ./darcsweb.cgi in those versions.  It was moved in a previous patch in
the repository I'm pulling to.

using darcs 1.0.6 from Debian Etch.

keturn,

Would you be willing to test this again with darcs 1.0.9 or the Darcs 2
pre-release (binaries are available through the wiki?)

Also, developing a test script to trigger the bug would also make it faster to
resolve. There are examples in the "tests" directory of the darcs repository. 

Thanks!

   Mark

This happens when trying to merge conflicting JHC changes into LHC with
--external-merge :-(

This is with a version of darcs 2 right?
Any chance we could ask you for a test case for use with our bugs/ directory?

How would I go about that? I don't see anything about it in
http://wiki.darcs.net/index.html/DeveloperFAQ or
http://wiki.darcs.net/index.html/DeveloperTips :-(.

On Sat, Feb 28, 2009 at 11:48:24 -0500, Samuel Bronson wrote:
> How would I go about that? I don't see anything about it in
> http://wiki.darcs.net/index.html/DeveloperFAQ or
> http://wiki.darcs.net/index.html/DeveloperTips :-(.

Hmm, darcs get http://darcs.net
Copy one of the examples in the bugs/ directory
edit as needed
darcs add
darcs record
darcs send

The tests are just shell scripts; each script aborts and fails when one
of its steps has a non-zero exit status

Is that what you mean?

On Sun, Mar 1, 2009 at 2:37 AM, Eric Kow <bugs@darcs.net> wrote:
>
> Eric Kow <kowey@darcs.net> added the comment:
>
> On Sat, Feb 28, 2009 at 11:48:24 -0500, Samuel Bronson wrote:
>> How would I go about that? I don't see anything about it in
>> http://wiki.darcs.net/index.html/DeveloperFAQ or
>> http://wiki.darcs.net/index.html/DeveloperTips :-(.
>
> Hmm, darcs get http://darcs.net
> Copy one of the examples in the bugs/ directory
> edit as needed
> darcs add
> darcs record
> darcs send
>
> The tests are just shell scripts; each script aborts and fails when one
> of its steps has a non-zero exit status
>
> Is that what you mean?

Yeah, basically. But how will I refer to the dummy merge tool that
I'll have to write? (i.e. what working directory are tests run in?)

Mon Mar  2 14:53:20 EST 2009  Samuel Bronson <naesten@gmail.com>
  * Test for issue189
  It's kind of crippled, though, since without a fix for issue1228, the
  last command would hang, so I stuck "exit 1 && " in front of it for now.

Attachments

• test-for-issue189.dpatch
• unnamed

Oops -- just noticed I must have messed up the issue title by sending my test
patch with a different subject line :-(. Fixing.

I've submitted Sam's test to the list (thanks!).

Marking need-implementation, as  I think this is fairly straightforward and
shallow, although maybe not enough to make it a ProbablyEasy bug.

See patch2236