On Fri, Nov 20, 2015 at 9:53 PM, Eduard <eduard.c.dumitre...@gmail.com>
wrote:
> On 11/20/2015 03:10 PM, Stephan Beal wrote:
>
> That alias is the name of the current branch (which you seem to want to
> avoid, though i'm not sure why).
>
> I'm trying to avoid it because the two disagree if there are multiple
> independent branches that share the same name.
>
Aha. But nobody would do such a thing... right? Instead they would re-tag
one of those branches with a different name, thereby solving the various
philosophical problems which arise from such a case. i suspect.
> $ f status
> tags: pending-review
> (user: andybradford)
> $ f up -n
> UPDATE src/add.c
>
> -------------------------------------------------------------------------------
> updated-to: d83fc58dead2d03428a763b0890b8b5fbffb7957 2014-01-09 13:17:23
> UTC
> tags: pending-review
> comment: Add comments to better explain what it happening for the
> out-of-tree check
> in the "add" command. (user: drh)
> changes: 1 file modified.
> $ f up -n pending-review
> updated-to: 2a1d7e0efc0f048b495815bac577d3c0f5c4d9a6 2015-10-20 08:14:11
> UTC
> tags: pending-review
> comment: Docker build "release" by default. Meant for upcoming Fossil
> release. (user:
> jan.nijtmans)
> changes: 322 files modified.
>
Aha, now i see the problem. i don't have a solution. In such a crazy case,
using the UUID is really the only sane choice.
> Again, I should have explained better. I want the diff between the current
> checkout (or even whatever commit the current checkout is based on) and
> what "fossil up" would update me to.
>
fossil up will update you (by default) to the latest checkin on the current
branch. In the case of multiple branches with the same name, i would
_expect_ fossil to know which of those branches you are on and DTRT, but i
don't know that it does (it might remember the name, not the UUID - i don't
recall).
> The point is to have a quick glance at whatever everyone else did before
> updating (because maybe they introduced a really obvious bug, or maybe they
> inserted malicious code). This is the main reason why I don't use autosync;
> because then I would have to remember what the last commit I trust was, and
> then "fossil diff --from ${last_trusted_commit} --to current".
>
Historical anecdote: autosync was added to help avoid forks, as a couple
inadvertent forks were created in the main repo early on (sometimes only a
few short moments apart from each other). In general autosync is A Good
Thing, but yet, it leaves a time window for potentially unexpected
behaviour. That said - i've never had that backfire on me.
> It depends what you mean by "tip" (whether it's the latest commit with a
> certain tag, or whether it's the latest commit with a certain tag *that
> is a direct descendant of the current commit*).
>
That, i don't know off hand. The source code says:
https://www.fossil-scm.org/index.html/artifact/404e7daea8b200e2?ln=186-190
so it seems to be the latter (direct descendant).
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
"Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
