Ticket UUID: | 7e0e4755c6d0b4e7ebea28617eac25eb17a50bcc | ||
Title: | Problem with mv and merge | ||
Status: | Open | Type: | Incident |
Severity: | Severe | Priority: | |
Subsystem: | Resolution: | ||
Last Modified: | 2011-04-25 10:55:55 | ||
Version Found In: | 047e06193b | ||
Description & Comments: | |||
Not sure if this should go here or in the mail-list, but I've encountered the following
problem:
C:\test>fossil new test.fossil && fossil open test.fossil project-id: 0ee562040ef8d3f09796012b3a2695a6f6be535f server-id: f2268a01c5c2ca258f893483398f677e26d12743 admin-user: User (initial password is "62d5e3") C:\test>echo A>foo.txt && fossil add foo.txt ADDED foo.txt C:\test>fossil ci -m "Added foo.txt" New_Version: 77476f7b51d992410a2e5c29bbecd3407d642fc5 C:\test>echo B>foo.txt C:\test>fossil ci -m "Branching off the trunk" --private New_Version: b3311a70dbc8c5584373300f6a64e60d57e63c32 C:\test>echo C>foo.txt && fossil ci -m "Working" New_Version: 43453f074f5f874d1dd65f494282f99972864404 C:\test>move foo.txt bar.txt && fossil mv foo.txt bar.txt RENAME foo.txt bar.txt C:\test>fossil ci -m "Renaming" New_Version: e079ebf753cb630acfab51c272ef5a915a63d1bd C:\test>echo D>foo.txt && fossil add foo.txt ADDED foo.txt C:\test>fossil ci -m "Adding (new) foo.txt" New_Version: 99c5b0ffa3f88a38bea6d0f7323669122c3e0c54 C:\test>fossil co trunk foo.txt C:\test>fossil merge private UPDATE foo.txt RENAME foo.txt -> bar.txt "fossil undo" is available to undo changes to the working checkout. C:\test>fossil ci -m "Private changes" New_Version: acf09654a00da5ee5633ce90d32d27332b95668e C:\test>fossil ls bar.txt then foo.txt was restored from an extrenal source (same version as in private brunch) because I had no time to check what was happened; and now I cannot merge at all: C:\test>fossil ci -m "Added back foo.txt" New_Version: 310e7a6762e0e1df88f5b9e21d560ce77e6c2d83 C:\test>fossil co private bar.txt foo.txt C:\test>echo E>foo.txt && fossil ci -m "WIP" New_Version: f7edf6d1669aa61b88630bd10a657099d25cd2e3 C:\test>fossil co trunk bar.txt foo.txt C:\test>fossil merge -n private MERGE bar.txt MERGE foo.txt ***** 1 merge conflicts in foo.txt RENAME foo.txt -> bar.txt C:\WINDOWS\system32\fossil.exe: SQLITE_CONSTRAINT: abort at 37 in [UPDATE vfile SET pathname='bar.tx t', origname=coalesce(origname,pathname) WHERE id=8 AND vid=12]: columns pathname, vid are not uniqu e C:\WINDOWS\system32\fossil.exe: columns pathname, vid are not unique UPDATE vfile SET pathname='bar.txt', origname=coalesce(origname,pathname) WHERE id=8 AND vid=12 If you have recently updated your fossil executable, you might need to run "fossil all rebuild" to bring the repository schemas up to date. C:\WINDOWS\system32\fossil.exe: SQLITE_BUSY: statement aborts at 2: [ROLLBACK] cannot rollback trans action - SQL statements in progress Was it my fault or is it a bug? What should I do now to continue working with this repository? |