Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

JB 2006: File > Compare files... weirdness

0 views
Skip to first unread message

Paul Furbacher [TeamB]

unread,
Jul 25, 2006, 8:25:50 AM7/25/06
to

This afternoon I ran into something really weird.

I had been working on one file for a long time, refactoring
and adding Javadoc. Let's call it File_One in Project_1.

Then I turned my attention to another set of files, one a .keep
which Clear Case made when I checked out a file which had already
had lots of changes which I couldn't commit -- a more important
bug fix had to go in before these other changes.

Let's call these File_X and File_X.keep, in Project_2. Note
that there are ***two*** (2) different projects here.

So, when I got back to working on the refactorings and such
in File_X for which there was a .keep, I wanted to compare
and merge File_X and File_X.keep. I went to File > Compare files...
and selected the .keep version for the left-hand, and the File_X.java
for the right-hand pane.

I flipped to the "Diff view" tab. Smart diff was on.

Since the .keep file had many "improvements" that I wanted to
merge back into the .java file, I began by choosing one change
and reverting it.

Suddenly, after the refresh, the viewer showed code
snippets from File_One, Project_1! Yikes. That can't be.
So I canceled and went through the File > Compare files ...,
selected left-hand, selected right-hand, switched to the
"Diff view" tab and began merging by doing the same revert.
Again, snippets from File_One, Project_1!

I quit JBuilder 2006 and restarted. Same steps, same result.

No errors were being thrown in the console window.


I eventually had to dirty and save File_X so that I could use
it as the "old file", delete File_X, rename File_X.keep to just
File_X.java and use the Diff in the History tab.


Has anyone seen this behavior before? I found no report of
it in QC searching on the keyword "diff".


--


Paul Furbacher (TeamB)

Save time, search the archives:
http://info.borland.com/newsgroups/ngsearch.html

Is it in Joi Ellis's Faq-O-Matic?
http://www.visi.com/~gyles19/fom-serve/cache/1.html

Finally, please send responses to the newsgroup only.
That means, do not send email directly to me.
Thank you.

Message has been deleted
0 new messages