2015-04-17 12:02 GMT+02:00 Joerg Sonnenberger <jo...@britannica.bec.de>:
> On Thu, Apr 16, 2015 at 09:04:12PM -0400, Ron W wrote:
>> On Thu, Apr 16, 2015 at 8:25 PM, Andy Bradford <amb-fos...@bradfords.org>
...
>> I disagree. While it might be the most common case, merging does not
>> explicitly state any intent beyond the merge itself, even a full merge.
>> After all, a merge doesn't automatically close a named branch. So why would
>> a merge automatically make a "fork" not a fork?
>
> You can still create commits from it, but update will move past it.
> That's why it is no longer a fork.
Let's try that with a branch which is recently merged to trunk:
$ fossil update update-fork-warn
....
updated-to: 72794ec975ce4c8e43d519c1267eff1baab290fe 2015-04-10
17:33:18 UTC
leaf: closed
tags: update-fork-warn
comment: Only check for forks on "open" leaves, otherwise we
cannot do anything about it from here anyway. Thanks to Andy Bradford
for noticing this. (user: jan.nijtmans)
changes: 13 files modified.
"fossil undo" is available to undo changes to the working checkout.
$ fossil update
....
checkout: 72794ec975ce4c8e43d519c1267eff1baab290fe 2015-04-10
17:33:18 UTC
leaf: closed
tags: update-fork-warn
comment: Only check for forks on "open" leaves, otherwise we
cannot do anything about it from here anyway. Thanks to Andy Bradford
for noticing this. (user: jan.nijtmans)
changes: None. Already up-to-date
Looks like that statement is not true! "fossil update" will only move
past it if the
branch-name didn't change. I think Andy was right in his statement: the only
three ways a fork can be resolved is:
1) "fossil merge" without any arguments, merging the two tips of the
fork together.
2) "fossil merge --integrate <branchname>": merging to another branch, while
implicitely closing <branchname>.
3) "fossil tag --raw closed <uuid>" (or close it with the UI)
So, a merge which merges the two tips of a fork together indeed closes
the fork. But
for other merges more needs to be done, that's how it functions (as it should).
Sorry ;-)
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
