[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge Tracking Metadata Interface

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-06 15:12:16 CEST

On 7/6/06, Kamesh Jayachandran <kamesh@collab.net> wrote:
> Garrett Rooney wrote:
> > As I was watching dlr tweak tests on the merge-tracking branch to
> > expect the presence of a svn:mergeinfo property, I started to wonder
> > if that's really how we want to show things to the user. Do we want
> > the fact that merge info has been stored in the working copy to show
> > up in status output in the same place as we indicate a change to (for
> > example) svn:ignore? I'm not positive one way or the other, but I
> > think we should discuss it before Dan spends days tweaking tests.
> Are you sure about svn:ignore ?
> [kamesh@kamesh ttt]$ svn ps svn:ignore '1' trunk
> property 'svn:ignore' set on 'trunk'
> [kamesh@kamesh ttt]$ svn st
> M trunk
> [kamesh@kamesh ttt]$ svn diff
>
> Property changes on: trunk
> ___________________________________________________________________
> Name: svn:ignore
> + 1

What I meant when I referred to svn:ignore was that if we want to make
it clear that merge info was being tracked, it might be worthwhile
having that show up separately from other directory property changes,
like svn:ignore, at least in status output. Sure, the diff shows you
that it's an ignore change, but the status just shows up like any
other propchange.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 6 15:12:46 2006

This is an archived mail posted to the Subversion Dev mailing list.