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

Re: isn't variance adjusted patching horribly dangerous?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-04-10 02:42:54 CEST

Garrett Rooney <rooneg@electricjellyfish.net> writes:

> > Are you saying that with internal diff Philip's example (one
> > containing "svn merge -r 2:3 wc/bar wc/foo") will not work as he
> > says it does?
> i have no idea, i haven't tried it ;-)

It's what one gets from HEAD using the builtin diff. If you want to
reproduce it then create wc/foo containing my "Original" and commit,
copy wc/foo to wc/bar and commit, edit wc/foo and wc/bar to create
"Change 1" and "Change 2" and commit. Then run merge.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 02:43:43 2003

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.