[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: Chia-liang Kao <clkao_at_clkao.org>
Date: 2005-06-09 19:31:12 CEST

Matthijs Kooijman <m.kooijman <at> student.utwente.nl> writes:
> In another reply, John Peacock mentions SVK's patch management and diff
> format. I have already looked at SVK and think there are a lot of good things
> in svk. Yet it's patch management is nothing more than central storage of
> patches in a repo. Patches are stored as normal text files in the repo, and
> once applied, no special treatment is given to them.
> As for the tree-aware diff format they are using (according to John), I have
> not looked at that. When implementing WC-Patches, I will probably add support
> for a tree-aware patch format too. I'll look at the svk format if it is usable
> for svn.

What svk patch stored is just serialized delta editor calls, along with the
target tree/rev that the editor call applies to. svk patch --apply is able to
use such information to perform a 3-way merge when the target has been
changed; it can also update the patch painlessly to provide a cleanly
applicable patch, which makes life easier for people using plain old
/usr/bin/patch.

Cheers,
CLK

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 9 19:43:52 2005

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