...
> > I've been mildly bitten by this behavior before. When merging from a
> > branch a warning that you haven't sync'd would be a nice to have.
> > Autosync prior to merge would work for me but the warning would be a
> > decent alternative.
> > 
> 
> +1 for the warning message... 
> 
...

+2 on the warning message; I can see the utility in it.

Please don't make auto-sync before merge the default behavior.  At best,
make it an option to cause it to happen.

On active repos, particularly those with feature branches, there will often
be activity down-line that I have not reviewed, and do not want to pull in,
and do not want to interrupt my commit activities to be forced to review
them.  (Nor do I want to cherry-pick, because that is at a single change
set, and does not pick up the things before to common ancestor. Though I
guess if I were to merge from the relevant checkin id, rather than the
symbolic name, I can achieve the same effect....).

-dave


_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to