2014-07-30 20:40 GMT+02:00 Richard Hipp <d...@sqlite.org>:
> For a recent example, see:
>
> http://www.fossil-scm.org/fossil/timeline?c=0d8cb8e30a
>
> Jan originally checked in version [0d8cb8e30a] onto trunk. But then later
> decided to shift that check-in onto the "pending-review" branch. Later
> still, the "pending-review" branch was merged back into trunk.
A better example is:
<www.fossil-scm.org/fossil/timeline?c=45feda65e9>
which was originally committed to trunk, but later
shifted to the "utime_usleep" branch (because there
was a fundamental flaw in it which needed to be fixed first)
The example you mention was committed to the
"no-initial-commit" branch and then augmented with
the "pending-review" tag. Later I merged it to trunk
and canceled the "pending-review" branch.
That's different ;-)
Anyway, I agree with the given explanation, which is
indeed a normal work flow. Just the given example
commit did not match the explanation.
Regards,
Jan Nijtmans
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
