[darcs-devel] [darcs #203] amend-record didn't remove origanal patch on smbfs mounted share.

[kirstin penelope rhys via RT]

Fri Feb 04 19:21:41 2005: New ticket: 203.
Transaction: Ticket created by kirstin.rhys at helicor.com
       Queue: Darcs
     Subject: amend-record didn't remove origanal patch on smbfs mounted share.
       Owner: Nobody
  Requestors: kirstin.rhys at helicor.com
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=203 >


Hi,

I'm afraid this won't be much help, since the I can't share the 
code/repository...

I made some changes in "build" which resides on a smb mounted windows box.

One of the patches I modified with amend-record.

I pulled them into "export" on the local unix file system.

The pull completed with apparent success, but told me I had conflicts, which I 
knew wasn't possible.

Upon inspection, one of the patches was somehow duplicated. It was the one 
that I had used amend-record on (but before I pulled).

So, now I have two patches, the original, and the amended, both trying to make 
the some of the same changes.

This broke "export", so deleted it, and recreated it with a get.

Oh, both export and build are partial repositories.

Oddly, it works now, and doesn't report any conflics, but those two patches, 
the original and amended, are now present in both repositories. In fact, I 
pulled the changes from the new "export" into "pre-export", which is a full 
repository, with no problems. Weird. 

Any advice? Leave this be, delete one of them, make a new repository and pull 
all but one of them--and can I even do that, since they have the same name?

In general, does darcs have any protection against patches with the same name? 

Thanks,

kirstin

Oh, by the way, it's version 1.0.1, on a debian sarge box.



kirstin at uni:~/src/helicor/export$ darcs unpull --patch "Added third target 
output for the"

Fri Feb  4 17:04:51 EST 2005  kirstin.rhys at helicor.com
  * Added third target output for the user interface, target_number, currently 
set to the last amplitude in bpm.
Shall I unpull this patch? [yNvq?] y

darcs failed:  Couldn't commute patch past pending.
kirstin at uni:~/src/helicor/export$ darcs resolve

Fail: bug in darcs!
fromJust error at Resolution.lhs:168 compiled 03:04:02 Dec 29 2004
Please report this to bugs at darcs.net


-- 
The wonderful thing about a dancing bear is not how well he dances,
but that he dances at all.