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

Re: augmented diff design patch format

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2007-06-24 22:02:43 CEST

"Charles Acknin" <charlesacknin@gmail.com> writes:

> - we don't want 'svn diff' default behaviour (designed more for
> patch review than for patch(1) use) to be changed -- 'default'
> - because of 'default' design, we need another format that really
> fits with a patch(1) use -- 'unidiff'

The existing format already works with patch, as can any new
format we come up with, so long as we still use unidiff for
actual text diffs; patch ignores everything else. Since the
editor commands in this new diff can themselves be human readable
(users will quickly become accustomed to what it means), i don't
see why we need even two formats, much less three.

0 wc% svn up
At revision 5.
0 wc% svn st
0 wc% svn ls
file1
0 wc% echo hi >> file1
0 wc% echo hi > file2
0 wc% svn add file2
A file2
0 wc% svn di
( open-root ( ( ) 2:d0 ) )
( open-file ( 5:file1 2:d0 2:c1 ( 5 ) ) )
( add-file ( 5:file2 2:d0 2:c2 ( ) ) )
( close-dir ( 2:d0 ) )
( apply-textdelta ( 2:c1 ( 32:b4b76f73deccb21b3bec1ebee83a5234 ) ) )
Index: file1
===================================================================
--- file1 (revision 5)
+++ file1 (working copy)
@@ -180,3 +180,4 @@
 #fi
 
 chpwd
+hi
( textdelta-end ( 2:c1 ) )
( close-file ( 2:c1 ( 32:a87940d432faa1fb999d7c53182d78ee ) ) )
( apply-textdelta ( 2:c2 ( ) ) )
Index: file2
===================================================================
--- file2 (revision 0)
+++ file2 (revision 0)
@@ -0,0 +1 @@
+hi
( textdelta-end ( 2:c2 ) )
( close-file ( 2:c2 ( 32:764efa883dda1e11db47671c4a3bbd9e ) ) )
( close-edit ( ) )

We've needed this feature for a long time, and i'm looking
forward to seeing your patches! :)

-- 
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 24 22:02:25 2007

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.