On Wed, May 23, 2012 at 5:25 PM, Michael L. Barrow <mlbar...@barrow.me>wrote:
>
> Currently it looks to the first person to commit as though their changes
>> were discarded. The file is marked "MERGED" yet only contains content from
>> the last person to add. Perhaps not something that will happen very often
>> but the behavior is clearly wrong.
>>
>>
>>
> Unless I did something wrong while emulating the tests, the data is not
> "discarded" per se. One can move aside the new version of the file, update
> to get the old version and then manually do the merge.
>
> Was that not your experience?
Yes, of course the old data is available and recovery is not hard. The
behavior is still far from ideal in my opinion. You don't drop lines from a
file with no visible hint to the user what data may be missing.
I copied the script and ran it with some additional scenarios to see what
would happen:
1. as test case was provided by Justin
result: CONFLICT
no hint inside the file of conflicting data.
no launch of gui merge tool
may or may not be easy to merge with gui merge tool
2. with all lines the same but for one
result: "CONFLICT"
no hint inside the file of conflicting data
no launch of gui merge
very easy to merge with a gui merge tool
3. with one line added at end of file
result: "CONFLICT"
no hint inside the file of the potentially missing line
no launch of gui merge
gui tools automatically merge these correctly.
4. identical files
result: "CONFLICT"
no merge necessary
Every one of these cases is not handled well by fossil and there is no hint
that data was dropped from view. I think a new user will be very confused
by what they see.
The 1st and 2nd case should have the conflict markers and or launch the
merge gui.
The 3rd case should probably be automatically merged with no CONFLICT
warning.
The 4th case should NOT report CONFLICT.
--
> Michael Barrow
> michael at barrow dot me
> +1 (408) 782-4249
>
>
> ______________________________**_________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.**org <fossil-users@lists.fossil-scm.org>
> http://lists.fossil-scm.org:**8080/cgi-bin/mailman/listinfo/**fossil-users<http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users>
>
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
