T
Tom Anderson
Hi chaps,
This is an Eclipse question, but since Eclipse is a Java IDE, i thought
i'd try here first. I'll brave the Eclipse forums if necessary, but only
if necessary!
We use Eclipse. I checked out a project from our CVS server some time the
week before last, and have been doing some far-ranging editing since then.
Elsewhere in the office, someone else has also been doing some large-scale
reorganisation, and has now checked that in. The difference between my
current state and the head is big enough that i don't fancy merging the
two (plus, there's a lot of leftover debris from my editing, which was not
done very hygeinically - it started out as an experiment and became a
feature). Rather, what i want to do is capture the work i've done as a
patch file, then throw away my work, update to the head, and then think
about manually bringing my work in in small chunks, committing to CVS as i
go. I honestly think this will be less work in the long run than doing a
big merge.
The problem is that i have no idea how to make the patch. You can make a
patch of anything you've diffed, but what do i diff against? It's not the
head; it needs to be the version that i originally checked out. But that
was two weeks ago, and wasn't a particular tag. If i knew the exact time
and date of the checkout, i could pick a version based on that, but i
don't. So how do i do this? Is there a 'diff against last checkout'
option? Is there some way to look up the time of the last checkout? Any
ideas?
Thanks,
tom
This is an Eclipse question, but since Eclipse is a Java IDE, i thought
i'd try here first. I'll brave the Eclipse forums if necessary, but only
if necessary!
We use Eclipse. I checked out a project from our CVS server some time the
week before last, and have been doing some far-ranging editing since then.
Elsewhere in the office, someone else has also been doing some large-scale
reorganisation, and has now checked that in. The difference between my
current state and the head is big enough that i don't fancy merging the
two (plus, there's a lot of leftover debris from my editing, which was not
done very hygeinically - it started out as an experiment and became a
feature). Rather, what i want to do is capture the work i've done as a
patch file, then throw away my work, update to the head, and then think
about manually bringing my work in in small chunks, committing to CVS as i
go. I honestly think this will be less work in the long run than doing a
big merge.
The problem is that i have no idea how to make the patch. You can make a
patch of anything you've diffed, but what do i diff against? It's not the
head; it needs to be the version that i originally checked out. But that
was two weeks ago, and wasn't a particular tag. If i knew the exact time
and date of the checkout, i could pick a version based on that, but i
don't. So how do i do this? Is there a 'diff against last checkout'
option? Is there some way to look up the time of the last checkout? Any
ideas?
Thanks,
tom