You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2006/07/10 19:48:37 UTC
Re: svn commit: r20382 - in trunk/subversion: libsvn_wc
tests/cmdline
rooneg@tigris.org writes:
> Author: rooneg
> Date: Mon Jul 3 11:20:59 2006
> New Revision: 20382
>
> Modified:
> trunk/subversion/libsvn_wc/status.c
> trunk/subversion/tests/cmdline/stat_tests.py
>
> Log:
> Show conflicts on added files in status output. Previously if a file was
> added and had conflicts it only showed up as added, not conflicted.
Did you look at issue 2397 before making this change? At the very
least the log message should mention the issue number. I think the
log should clearly state that conflicts are now shown instead of adds
to make clear that it's not showing both.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r20382 - in trunk/subversion: libsvn_wc tests/cmdline
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/10/06, Philip Martin <ph...@codematters.co.uk> wrote:
> rooneg@tigris.org writes:
>
> > Author: rooneg
> > Date: Mon Jul 3 11:20:59 2006
> > New Revision: 20382
> >
> > Modified:
> > trunk/subversion/libsvn_wc/status.c
> > trunk/subversion/tests/cmdline/stat_tests.py
> >
> > Log:
> > Show conflicts on added files in status output. Previously if a file was
> > added and had conflicts it only showed up as added, not conflicted.
>
> Did you look at issue 2397 before making this change? At the very
> least the log message should mention the issue number. I think the
> log should clearly state that conflicts are now shown instead of adds
> to make clear that it's not showing both.
Actually, I wasn't aware of it, but now that I see it I agree, it
should probably be mentioned. I'll update the log later today.
Thanks,
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org