[fossil-users] Possible rename/revert bug?

2013-01-07 Thread Joel Bruick

Hello all!

I ran into some odd behavior with running revert on a checkout in which a 
rename has just been performed. The renamed file gets deleted, but the 
original file doesn't get restored. No changes are reported by 'fossil 
changes', although the checkout is certainly not in its original state. The 
fastest way to do that is to just close and reopen the repo. Alternatively, 
you could run undo, rename the file back, and then run revert again. That 
would get more annoying if you had renamed multiple files, obviously. I also 
noticed that you can recover the original file by calling revert on the 
original filename, but then fossil appears to see it as a new file (it 
appears as ADDED in the output of 'fossil addremove --test').


This should be easy to reproduce. Just create a repo and commit a file into 
it. Then change that file's name and run 'fossil mv'. Finally, run 'fossil 
revert' and you should see the behavior I've described.


Is this the proper behavior for revert? Is there a different way I should 
handle this scenario? Is this a legitimate bug that I should file a ticket 
for (I couldn't find an existing one)? Am I a moron? The answer to one of 
these questions is certain to be yes!


Thanks for the help! 


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Possible rename/revert bug?

2013-01-07 Thread Stephan Beal
On Mon, Jan 7, 2013 at 10:00 AM, Joel Bruick joelbru...@msn.com wrote:

 This should be easy to reproduce. Just create a repo and commit a file
 into it. Then change that file's name and run 'fossil mv'. Finally, run
 'fossil revert' and you should see the behavior I've described.



FWIW, here's a reproduction:

[stephan@host:~/cvs/fossil]$ mkdir foo
[stephan@host:~/cvs/fossil]$ cd foo
[stephan@host:~/cvs/fossil/foo]$ f new ../foo.fsl
project-id: 64987e5fdcdaca95f9d3a0e84e0167c5383651bb
server-id:  0a5c186da86a4ed0f787b2e616a8e61a4ab2eef8
admin-user: stephan (initial password is 79d1e3)
[stephan@host:~/cvs/fossil/foo]$ f open ../foo.fsl
[stephan@host:~/cvs/fossil/foo]$ touch foo.bar
[stephan@host:~/cvs/fossil/foo]$ f add foo.bar
ADDED  foo.bar
[stephan@host:~/cvs/fossil/foo]$ f com -m egg foo.bar
New_Version: c8ec925d1981bcbabf6fdcc856bda53fd1c13ee5
[stephan@host:~/cvs/fossil/foo]$ mv foo.bar bar.foo
[stephan@host:~/cvs/fossil/foo]$ f mv foo.bar bar.foo
RENAME foo.bar bar.foo
[stephan@host:~/cvs/fossil/foo]$ f revert
DELETE: bar.foo
 fossil undo is available to undo changes to the working checkout.
[stephan@host:~/cvs/fossil/foo]$ l
total 24
drwxrwxr-x  2 stephan stephan  4096 Jan  7 10:13 .
drwxrwxrwx 46 stephan stephan  4096 Jan  7 10:13 ..
-rw-r--r--  1 stephan stephan 13312 Jan  7 10:13 .fslckout


That said, i'm not at all familiar with those particular bits and my day
job has priority on my time for the foreseeable future, so i will have to
defer the investigation/fix to someone who knows those parts :/.

 Is this the proper behavior for revert?

My assumption is no.

 Is this a legitimate bug that I should file a ticket for (I couldn't find
an existing one)?

Yes, please.

 Am I a moron?

Based solely on this post, i'd have to say no ;).

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Possible rename/revert bug?

2013-01-07 Thread Richard Hipp
On Mon, Jan 7, 2013 at 4:22 AM, Stephan Beal sgb...@googlemail.com wrote:

 On Mon, Jan 7, 2013 at 10:00 AM, Joel Bruick joelbru...@msn.com wrote:

 This should be easy to reproduce. Just create a repo and commit a file
 into it. Then change that file's name and run 'fossil mv'. Finally, run
 'fossil revert' and you should see the behavior I've described.



 FWIW, here's a reproduction:


I think this is fixed in trunk now (see
http://www.fossil-scm.org/fossil/info/48798b2719).  Please follow-up if you
disagree.

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users