[fossil-users] Updating, with files moved

2010-11-23 Thread Lluís Batlle i Rossell 
Hello,

I had the working directory with some files moved from one directory to another:

Something like this, but on three files:
fossil mv path/file.txt path2/file.txt
mv path/file.txt path2/file.txt
edit path2/file.txt
...

Then I decide to do:
fossil update  # being on trunk

And to my surprise, the update had lines like:
CONFLICT path2/file.txt
REMOVE path2/file2.txt
ADD path/file.txt
ADD path/file2.txt


So it updated the working directory quite wrong, if I understand correctly. Some
of the files I had were removed.
And the 'fossil status' now shows nothing about path2, but all edited in 'path'.
All the 'fossil mv' things went away.

It seems like today I'm having more troubles than usual with fossil. :)
(version [cf178577ec])
___
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] Updating, with files moved

2010-11-23 Thread Lluís Batlle i Rossell 
On Tue, Nov 23, 2010 at 03:00:10PM +0100, Lluís Batlle i Rossell wrote:
 Hello,
 
 I had the working directory with some files moved from one directory to 
 another:
 
 Something like this, but on three files:
 fossil mv path/file.txt path2/file.txt
 mv path/file.txt path2/file.txt
 edit path2/file.txt
 ...
 
 Then I decide to do:
 fossil update  # being on trunk
 
 And to my surprise, the update had lines like:
 CONFLICT path2/file.txt
 REMOVE path2/file2.txt
 ADD path/file.txt
 ADD path/file2.txt
 
 
 So it updated the working directory quite wrong, if I understand correctly. 
 Some
 of the files I had were removed.
 And the 'fossil status' now shows nothing about path2, but all edited in 
 'path'.
 All the 'fossil mv' things went away.

I forgot to mention that none of the files I had modified were modified between
the initial ckout and the head of trunk. So it should have been trivial to
merge, I think.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users