Andrew Beekhof wrote:
> because c2d9d5cce14c and 4b4fc04624bb are on a different development
> stream/branch which didn't get merged in with your changes until
> c5d0627925f0
>
> remember how you promised to learn about the version control tool you
> wanted us to use?
>
> helpful command:
> hg glog
There is no 'glog' subcommand. I assume you meant 'hg log'.
The change did go into the base. I pulled down the updated base into my
second workspace before doing the merge. I did the merge. I got _no_
indications of any problems. If Dejan hadn't coincidentally had a copy
of the base with my changes in it, they would have been silently lost
forever.
If this is working as designed, then this behavior is 'broken as
designed'. Note that it didn't see my changes as belonging to me (in
the attribution), it saw them as belonging to Dejan.
Does silently throwing away changes when doing merges serve some purpose
I've missed out on?
This isn't a "merge" command, it's a "throw all the changes in the base
away" command.
What I want to know is why this doesn't happen all the time. After all,
the same thing happens between your workspace and mine and Dejan's all
the time.
Can you enlighten me here?
Or kindly point me to the relevant piece of the documentation that
discusses the situation I found myself in?
--
Alan Robertson <[EMAIL PROTECTED]>
"Openness is the foundation and preservative of friendship... Let me
claim from you at all times your undisguised opinions." - William
Wilberforce
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
