darcs

Issue 189 --external-merge tool should properly reference renamed files

Title --external-merge tool should properly reference renamed files
Priority bug Status needs-implementation
Milestone Resolved in
Superseder Nosy List SamB, darcs-devel, dmitry.kurochkin, keturn, kowey, markstos, thorkilnaur, tommy, twb
Assigned To
Topics

Created on 2006-06-28.19:50:46 by keturn, last changed 2009-09-04.17:23:27 by kowey.

Files
File name Uploaded Type Edit Remove
test-for-issue189.dpatch SamB, 2009-03-02.20:07:13 text/x-darcs-patch
unnamed SamB, 2009-03-02.20:07:13 text/plain
Messages
msg712 (view) Author: keturn Date: 2006-06-28.19:50:44
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.
msg2579 (view) Author: markstos Date: 2008-01-19.05:26:08
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
msg7362 (view) Author: SamB Date: 2009-02-28.00:16:11
This happens when trying to merge conflicting JHC changes into LHC with
--external-merge :-(
msg7363 (view) Author: kowey Date: 2009-02-28.08:51:32
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?
msg7365 (view) Author: SamB Date: 2009-02-28.16:48:33
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 :-(.
msg7366 (view) Author: kowey Date: 2009-03-01.07:37:52
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?
msg7368 (view) Author: SamB Date: 2009-03-01.15:02:51
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?)
msg7384 (view) Author: SamB Date: 2009-03-02.20:07:13
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
msg7482 (view) Author: SamB Date: 2009-03-21.19:21:34
Oops -- just noticed I must have messed up the issue title by sending my test
patch with a different subject line :-(. Fixing.
msg8199 (view) Author: kowey Date: 2009-08-17.07:10:44
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.
History
Date User Action Args
2006-06-28 19:50:46keturncreate
2008-01-19 05:26:09markstossetstatus: unread -> unknown
nosy: + markstos, kowey, beschmi
messages: + msg2579
title: trouble external merge tool on moved files -> --external-merge tool should properly reference renamed files
2008-02-16 16:12:29markstossetstatus: unknown -> deferred
nosy: droundy, tommy, beschmi, kowey, markstos, keturn
2009-02-28 00:16:14SamBsetstatus: deferred -> unknown
nosy: + dmitry.kurochkin, SamB, simon, thorkilnaur
messages: + msg7362
2009-02-28 01:37:42droundysetnosy: - droundy
2009-02-28 08:51:34koweysetnosy: tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7363
2009-02-28 16:48:35SamBsetnosy: tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7365
2009-03-01 07:37:55koweysetnosy: tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7366
2009-03-01 15:02:55SamBsetnosy: tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7368
2009-03-02 20:07:15SamBsetfiles: + test-for-issue189.dpatch, unnamed
nosy: + darcs-users
messages: + msg7384
title: --external-merge tool should properly reference renamed files -> partial test
2009-03-02 20:11:25SamBsetfiles: + test-for-issue189.dpatch, unnamed
nosy: darcs-users, tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7385
2009-03-02 20:20:39SamBsetnosy: darcs-users, tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: - msg7385
2009-03-02 20:20:50SamBsetfiles: - test-for-issue189.dpatch
nosy: darcs-users, tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
2009-03-02 20:21:00SamBsetfiles: - unnamed
nosy: darcs-users, tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
2009-03-02 20:21:41SamBsetnosy: - darcs-users
2009-03-21 19:21:38SamBsetnosy: tommy, beschmi, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg7482
title: partial test -> --external-merge tool should properly reference renamed files
2009-08-06 20:50:16adminsetnosy: - beschmi
2009-08-17 07:10:55koweysetstatus: unknown -> needs-implementation
nosy: tommy, kowey, markstos, keturn, SamB, simon, thorkilnaur, dmitry.kurochkin
messages: + msg8199
2009-08-25 17:41:24adminsetnosy: + darcs-devel, - simon
2009-08-27 14:25:16adminsetnosy: tommy, kowey, markstos, darcs-devel, keturn, SamB, thorkilnaur, dmitry.kurochkin
2009-09-04 17:23:27koweysetnosy: + twb
2009-09-04 17:24:14koweylinkissue1219 superseder