Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2016-02-06

| Channels | #darcs index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
01:05 drewbug joined #darcs
01:41 Big_G joined #darcs
02:11 dino- I just did something I'm unable to undo with my repo..
02:11 dino- I moved a file with `darcs mv`
02:11 dino- And then edited that new file, so I can commit these changes together..
02:12 dino- And then I accidentally executed the `darcs mv` command on that file again.
02:12 dino- The whatsnew list now shows the original move, and a new file (lowercase a) for the dest as well, and the source file listed as R
02:12 dino- I don't know how to undo that last `darcs mv`
02:13 dino- All of this is unrecorded yet, to be clear
02:13 dino- Does anyone here know how I can fix this?
02:17 dino- I feel kind of silly but I don't think I understand how to put back a file that was removed either, like with rm
02:17 dino- As in, you deleted a file (without darcs) from the repo but you want it back.
02:20 dino- I see, it should be revert, but with the situation like above (the clobbered darcs mv) hanging over it, rev has nothing to do for that file.
02:20 dino- This is a mess!
02:27 dino- I was able to clean it up by copying that new dest file to a safe place and then using interactive `darcs rev` to undo the various evil things I did.
02:27 dino- And then make the `darcs mv` change again, then copy the backup copy of the file over the dest for that.
02:51 drewbug joined #darcs
02:52 drewbug left #darcs
07:57 amgarching joined #darcs
09:15 Heffalump dino-: sounds a bit like a bug in darcs, though I'm not sure
09:24 amgarching joined #darcs
09:58 amgarching joined #darcs
15:06 Riastradh joined #darcs
15:19 Big_G joined #darcs
15:39 dino- Heffalump: It did say something about a post-hoc something when that 2nd mv happened. I'm not sure what the right thing to do in this situation would be, to tell you the truth.
15:43 Heffalump seems like it should have rejected the second move
15:51 Heffalump I can reproduce by issuing the same 'darcs mv' twice in a row. I don't think the behaviour makes sense.
15:52 dino- Ah, that's all it takes. I wasn't sure if it had something to do with changes to the working file contents between the two mvS, and didn't test further
15:52 dino- So you saw that 'Post-hoc' thing, I wasn't sure what it was trying to tell me with that.
15:53 dino- At least backing out with revert worked to put things back.
15:55 Heffalump if you record in that state it silently loses the new file
15:56 Heffalump I suspect a bug to do with how pending is handled, which has always been a source of confusion
16:00 dino- The new file that was marked 'a' (not 'A'), you mean? ugh
16:38 Heffalump yeah
16:38 Heffalump I'm also surprised the patch isn't considered corrupt, given that it ends up trying to move a non-existent file
16:42 prsai joined #darcs
17:12 Big_G joined #darcs
18:49 Big_G joined #darcs
19:04 Big_G joined #darcs
19:13 Big_G joined #darcs

| Channels | #darcs index | Today | | Search | Google Search | Plain-Text | summary