On Fri, 29 May 2015 17:38:39 +0200, Richard Hipp <d...@sqlite.org> wrote:
On 5/29/15, Matt Welland <mattrwell...@gmail.com> wrote:
This is an exceedingly confusing behavior from fossil but the fix is
easy.
Just do "fossil up trunk".
Indeed - Fossil is doing exactly the right thing here. If you just
"fossil update" it advances you to the tip of whatever branch your are
currently on. If you want to be at the tip of trunk, you really do
need to say "fossil update trunk".
We emphatically do NOT want Fossil second-guessing what branch you
want to be on when you do "fossil update" without an argument.
for sure not. OTOH: although it has not (yet) happened to me, I can easily
see that it is confusing to leave trunk if I *am* on trunk before the
update and just issue `fossil up' (which most of the time for most of the
users seems to mean "move me forward on this branch (especially trunk) to
the current, last "version" of this branch" rather than "move me to
wherever my current checkout has evolved". at least that would be me
guess...). so while fossil should not second-guess my intention and
implement it, it very well _might_ second-guess my intention and notify me
when I am probably doing something unintentional.
as with assorted other things (e.g. empty checkin messages), should fossil
not ask at this point (with a default of staying on the current branch)?
the scenario would be
* I am on branch X
* I issue `fossil up' w/o argument
* `fossil' notes that this will move me to a different branch since
someone else has transplanted the last checkin to a different branch
* fossil asks if I do want to proceed or simply stay where I am.
it should happen seldom enough in order not to annoy anybody if such a
question is issued.
thx/j
--
Using Opera's revolutionary email client: http://www.opera.com/mail/
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
