Thus said Marty on Tue, 13 May 2014 16:34:29 -0700: > Seems like there's a bug somewhere, but maybe there was an improper > sequence of user events?
Seems like a bug to me. Here is what I see: $ fossil merge trunk MERGE foo.txt RENAME foo.txt -> foobar.txt "fossil undo" is available to undo changes to the working checkout. $ ls foobar.txt $ fossil status repository: /tmp/clone2/../clone2.fossil local-root: /tmp/clone2/ config-db: /home/amb/.fossil checkout: 73951fbf2fd19417ddf4b6c9d877b7be6854d32a 2014-05-14 00:31:20 UTC parent: 2090599c2fec41329a4575da8af0f0feb9fa08ba 2014-05-14 00:27:31 UTC leaf: open tags: nineteen comment: ninetee (user: amb) EDITED foobar.txt MERGED_WITH 03764343bf2b76127272b251db39498f61ac31c1 $ fossil ci -m test Autosync: http://amb@remote:8080/ Round-trips: 1 Artifacts sent: 0 received: 0 Pull finished with 335 bytes sent, 1096 bytes received New_Version: f582b4d8ae4f24369b6e1c444ab6375ff0e7f9a1 Autosync: http://amb@remote:8080/ Round-trips: 1 Artifacts sent: 2 received: 0 Sync finished with 1382 bytes sent, 1146 bytes received Now, if I look at the manifest for f582b4d8ae4f24369b6e1c444ab6375ff0e7f9a1 C test D 2014-05-14T00:33:05.374 F foobar.txt 499805f9bda9104664e5ea6e2775fbced255a080 w foo.txt P 73951fbf2fd19417ddf4b6c9d877b7be6854d32a 03764343bf2b76127272b251db39498f61ac31c1 R d278be014f44cc6f10bb55ddd24e9fd3 U amb Z 5ee9592ecc6458755a9852b762f9c80b Indeed it didn't include foo.txt, so it silently removed foo.txt from the checkin. It picked up the rename from 03764343bf2b76127272b251db39498f61ac31c1 and it should have included the foo.txt from the same but didn't for some reason. Andy -- TAI64 timestamp: 400000005372bc5a _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
