You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bart Robinson <lo...@pobox.com> on 2006/01/07 02:21:58 UTC
roadmap for -c/--change option (r17054)?
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
Re: roadmap for -c/--change option (r17054)?
Posted by Bart Robinson <lo...@pobox.com>.
On 2006-1-10 Garrett Rooney <ro...@electricjellyfish.net> wrote:
> On 1/10/06, Bart Robinson <lo...@pobox.com> wrote:
> > Thanks Garrett. Mind if I file an ENH issue for 1 and 2? I
> > couldn't find dups for them. I'll probably take 1.
>
> 2 definately seems like it should get an issue, as the inconsistency
> is weird, and we should fix it eventually.
Thanks, issue 2481 posted:
http://subversion.tigris.org/issues/show_bug.cgi?id=2481
> If you're planning on submitting a patch for 1, I'd say just do it and
> don't worry about the issue, it's not that big a feature to add.
Discussion started in:
http://svn.haxx.se/dev/archive-2006-01/0338.shtml
-- bart
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: roadmap for -c/--change option (r17054)?
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 1/10/06, Bart Robinson <lo...@pobox.com> wrote:
> Thanks Garrett. Mind if I file an ENH issue for 1 and 2? I
> couldn't find dups for them. I'll probably take 1.
2 definately seems like it should get an issue, as the inconsistency
is weird, and we should fix it eventually.
If you're planning on submitting a patch for 1, I'd say just do it and
don't worry about the issue, it's not that big a feature to add.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: roadmap for -c/--change option (r17054)?
Posted by Bart Robinson <lo...@pobox.com>.
Thanks Garrett. Mind if I file an ENH issue for 1 and 2? I
couldn't find dups for them. I'll probably take 1.
-- bart
On 2006-1-9 Garrett Rooney <ro...@electricjellyfish.net> wrote:
> On 1/6/06, Bart Robinson <lo...@pobox.com> wrote:
>
> > 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).
>
> Nobody seems to have done any work 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.)
>
> Ditto.
>
> > 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.)
>
> This is unlikely to be implemented due to the fact that it's rather
> hard to do right with the current infrastructure.
>
> -garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org