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

roadmap for -c/--change option (r17054)?

From: Bart Robinson <lomew_at_pobox.com>
Date: 2006-01-07 03:21:58 CET

Hi, first dev posting, bear with me.

I was wondering what the status is of the -c/--change option to
merge and diff. I see it was commited in r17054 but I haven't
seen mention in the roadmaps and was able to find an issue for
it.

I'm probably moving our company over to svn (from cvs) in the
near future and I know getting -rN:M off by one will spin the
wheels of confusion. If it doesn't show up in an upcoming
release I can just try backporting r17054 to a local build but
I'd like to have some sense of if the -c notion will stick
around.

Brief review
        svn merge -c1234 url
same as
        svn merge -r1233:1234 url

I read the past threads
  http://svn.haxx.se/dev/archive-2005-10/1199.shtml
  http://svn.haxx.se/dev/archive-2005-10/1324.shtml
  http://svn.haxx.se/dev/archive-2005-10/1334.shtml

and it seems the remaining issues were

1. How to handle backing out a change. Someone proposed the
   --reverse option and that seemed to have have the most
   support. (My opinion is +1 on this).

2. Whether to fix the inconsistent use of -r to mean "change" or
   "revision" in log and diff. (My opinion is that this would
   be nice but sounds like a 2.0 change due to the differing
   semantics, although I could see -c being introduced and -r
   being left as inconsistent in a minor-level release.)

3. How to handle, or whether to support, multiple changes at a
   time, e.g., svn merge -c1,2,3. (My opinion is to keep it
   simple and not allow this, instead forcing the user to do one
   at a time and handle the potential conflicts at each step.)

I'm not saying my opinion is anything special, just offering it
for discussion.

Thanks
-- bart

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jan 7 03:22:31 2006

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