On 18/05/10 22:07, Markus Heidelberg wrote:
Tony Mechelynck, 2010-05-16 18:09:
for instance on my local
repository there's one additional revision every time I "fetch" the
source (if there is a change in one or more of src/version.c,
src/Makefile, src/eval.c or src/feature.h)
A few days ago I told you that it has *nothing* to do with your 4
locally modified files. Thanks for listening. I stop trying to help now,
you will find it out yourself.
But in short: the "Automated merge" changeset will always be created
because, even if there are no changes in your 4 modified files and thus
Mercurial doesn't has to merge on file level, it still has to merge on
history level.
Markus
Don't get up in a rage, Markus, I'm still learning this stuff. I've
never used a version-control system before and I'm making mistakes as I
go along. Okay, the parenthesis was unnecessary; but the point I was
making in that post (or maybe in that other post) was that I don't have
the same number of revisions as Bram (because of the additional merges
however many) or even as some other guy even if he too has local changes
(because one of us may pull several of Bram's revisions together,
resulting in just one merge, while the other may pull them in two or
more runs, resulting in that many merges). IIUC the point is still valid
but not really important, it just means the revision count (the ordinal
revision number) has no meaning when comparing different clones of one
repository -- what is comparable is Bram's latest revision (one of the
parents of the "tip" merge, in a repo with local changes) at the time of
the compile. The problem with that is that though it is possible to say
"this is the same revision as that", it is not obvious, when different,
to say which is the latest one. For that we would need a time reference
or something.
Best regards,
Tony.
--
So Richard and I decided to try to catch [the small shark].
With a great deal of strategy and effort and shouting, we managed to
maneuver the shark, over the course of about a half-hour, to a sort of
corner of the lagoon, so that it had no way to escape other than to
flop up onto the land and evolve. Richard and I were inching toward
it, sort of crouched over, when all of a sudden it turned around and --
I can still remember the sensation I felt at that moment, primarily in
the armpit area -- headed right straight toward us.
Many people would have panicked at this point. But Richard and
I were not "many people." We were experienced waders, and we kept our
heads. We did exactly what the textbook says you should do when you're
unarmed and a shark that is nearly two feet long turns on you in water
up to your lower calves: We sprinted I would say 600 yards in the
opposite direction, using a sprinting style such that the bottoms of
our feet never once went below the surface of the water. We ran all
the way to the far shore, and if we had been in a Warner Brothers
cartoon we would have run right INTO the beach, and you would have seen
these two mounds of sand racing across the island until they bonked
into trees and coconuts fell onto their heads.
-- Dave Barry, "The Wonders of Sharks on TV"
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
