Re: [Subclipse-users] Skipped files are omitted from summary
The new Collabnet Merge tool looks very handy for many other reasons too!
Mark Phippard wrote:
> On Fri, Aug 7, 2009 at 12:56 AM, Tom
> Walter<eclipsenews.20.epm_at_spamgourmet.com> wrote:
>> I find the file statistics Subclipse offers at the end of a merge
>> Merge complete.
>> ===== File Statistics: =====
>> Conflicts: 2
>> Added: 20
>> Updated: 33
>> I just noticed that it doesn't mention skipped files though. Skipped
>> files can be the most insidious causes of problems in SVN prior to 1.5
>> (we are unfortunately stuck with 1.4 for now at my company).
>> A skipped file essentially means that a change made on the incoming
>> branch could not be merged because the file it applied to has been
>> deleted. (These should be considered conflicts in my book, but be that
>> as it may).
>> Anyway it would be great if subclipse at least pointed out that some
>> files had been skipped, so you could be alerted to go back through the
>> output and see what happened. Skipped files easily slip under the radar
>> because they aren't considered conflicts, it is quite easy to commit
>> your merge as if it had all gone perfectly. And code just goes missing.
>> Any chance of adding them to the file stats?
> The CollabNet Merge client that is now provided on Subclipse update
> site shows this in the merge summary. It also displays them in the
> merge results view and offers some options for examining the skip as
> well as copying the item into the WC.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-08-10 02:42:12 CEST
This is an archived mail posted to the Subclipse Users