evil twin comparison
I have created evil twins in different workspaces, delivered one of them and am now comparing them in the workspace where I intend to accept them. The compare editor doesn't help at all. If I compare the incoming file, it says the previous version doesn't exist. If I compare the outgoing file, it says the previous version is empty.
What it doesn't do is compare the two evil twins! So how could I decide which to accept?
Regards,
David
What it doesn't do is compare the two evil twins! So how could I decide which to accept?
Regards,
David
2 answers
This is the workflow of using the compare editor to look at change sets vs
looking at a conflict. When you open an incoming or an outgoing change you
are comparing it against its previous state. i.e. -> . That is why the left hand sides are empty.
At this point when the change set is incoming, it isn't a fully fledge
conflict yet; it is only a potential conflict because you haven't yet
accepted it. (i.e. perhaps you might choose to rename your version of the
file before accepting, to avoid the evil twin case).
After you accept the change set, now you have a real evil-twin conflict
and now the comparison shows you 'mine' vs 'proposed'.
I hope that clarifies what's being shown on the left side and right side.
It's following the same kind of work flow with normal conflicts.
On Fri, 07 Aug 2009 03:53:04 -0400, David.Sedlock.infineon.com
<David> wrote:
--
looking at a conflict. When you open an incoming or an outgoing change you
are comparing it against its previous state. i.e. -> . That is why the left hand sides are empty.
At this point when the change set is incoming, it isn't a fully fledge
conflict yet; it is only a potential conflict because you haven't yet
accepted it. (i.e. perhaps you might choose to rename your version of the
file before accepting, to avoid the evil twin case).
After you accept the change set, now you have a real evil-twin conflict
and now the comparison shows you 'mine' vs 'proposed'.
I hope that clarifies what's being shown on the left side and right side.
It's following the same kind of work flow with normal conflicts.
On Fri, 07 Aug 2009 03:53:04 -0400, David.Sedlock.infineon.com
<David> wrote:
Note that once I accepted the incoming change set, and opened the
compare editor I saw the evil twins side by side.
So my question now is why I can't see them before acceptance.
--