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

Re: (SoC) Feature proposal: Patch-awareness

From: Matthijs Kooijman <m.kooijman_at_student.utwente.nl>
Date: 2005-06-13 20:31:26 CEST

> That's a much more focussed plan. Good. Now you need to consider how to
> perform the diffing and patching, how to handle conflicts, how to store the
> data, and how to provide a user interface to this.
I have not yet formed any concrete thoughts on this, since I first want to see
how current code performs the merging and conflict resolving.
The user interface would probably be most efficient as a curses-based
interface, yet I do not think this kind of interface won't really fit into the
current svn interface (as you comment below).
> No Subversion developers have commented publically on how this feature
> would fit into the Subversion project. My feeling is that it might not fit
> into the command-line client, but would be better as an auxiliary program.
The problem with this being an auxiliary program, is that you will need some
support in libsvn_wc, otherwise it will quite hacky and ugly code I expect.
Possibly some code can be in the libraries but not in the actual client, or in
a basic form in the client and have an extended (graphical) interface in an
external (wrapper) program.

> It would be a good idea to look also at what SER <ser@germane-software.com>
> has done in the thread "Block-level commits"
> <http://svn.haxx.se/dev/archive-2005-06/0449.shtml>, and share ideas. He
> has so far written a rather hacky script to do this sort of thing, but is
> interested in doing better.
I think this is essentially the same thing, yes. The only catch of the SoC
thing is that teamwork is not allowed, so cooperating might not be an option.
I'll check the exact meaning of the rules... (Would be a waste of effort

> (Note that I am just discussing your ideas when they interest me, as I
> would for any contributor to Subversion. I know nothing about the Summer
> of Code scheme and I am going to be off-line for several weeks so I can't
> promise to keep helping.)
That is the reason I posted my ideas here, so I can get feedback and improve
my plan/design. This way I can have a better proposal to apply with at SoC,
though even without getting accepted to the SoC I'll continue some work at
this (Though probably a lot slower, since I won't have so much time then :-).

Thanks for your help and comments,


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 13 20:32:40 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.