On Fri, Apr 6, 2012 at 8:16 PM, Kriangkrai Soatthiyanont
<kks...@gmail.com>wrote:
> It seems that `fossil changes` will show MERGED_WITH when you used
> `fossil merge`, not when `fossil update` (to fix "would fork" error).
> Anyway, after you have manually resolve conflicts, MERGED_WITH is
> still shown, so it seems there is no way to know which files have
> conflicts resolved, which files not.
>
> By the way, here is my workaround to mark unresolved merge files:
>
> % function fossil-changes {
> fossil changes "$@" |
> sed -r 's/EDITED(\s+)(.*)/grep -q "< BEGIN MERGE
> CONFLICT:" "\2" \&\& echo "U\1\2" || echo "\0"/e'; }
> % fossil-changes
> U file1
> % vi file1 # manually resolve conflicts
> % fossil-changes
> EDITED file1
>
I have added this snippet of code to the fsl wrapper. I hope you don't mind
:)
BTW, this is a serious annoyance for folks who don't use a gui tool for the
merge as it can be tedious to find all the files with conflicts. Is there
any solution planned?
How about adding flags in the _FOSSIL_ db for files with conflicts and
clear the flags on commit?
FYI, the wrapper can be found at:
http://kia...@chiselapp.com/user/kiatoa/repository/fsl
Thanks.
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> 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
