[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 01:44:40 CEST

"Sergey A. Lipnevich" <sergeyli@pisem.net> writes:

> Philip Martin wrote:
> > Fixing the same bug in two different ways is a mistake, it should
> > be fixed in one place and merged to the other. Yes, mistakes will
> > sometimes happen, but at other times adjacent changes like those
> > above will not be a conflict.
>
> This is the process flaw, you can't control it.

That's what I said.

> From common sense, they /are/ a conflict.

That's not true in general. It is only a conflict when one interprets
the text in a particular way, and any such interpretation is beyond
the scope of version control.

(It appears that your "common sense" and my "common sense" don't have
all that much in common!)

> > I disagree, this is not the wrong result--from a version control
> > point of view the changes have been combined perfectly.
>
> No matter what the theory is behind this, Tom's example definitely
> looks right to me,

Tom's example was contrived to give a conflict, I can contrive one
that does not

Original Change 1 Change 2

const char*email[]={ const char*email[]={ const char*email[]={
  "foo@bar.com", "foo@bar.com", "foo@bar.com",
  "zig@zag.com", "new_zig@zag.com", "zig@zag.com",
  "bif@bof.com", "bif@bof.com", "new_bif@bof.com",
  NULL NULL NULL
}; }; };

> I would refrain from using the system that would throw the context
> away.

Are you using Subversion?

$ svn diff -r 2:3 wc/bar
Index: wc/bar
===================================================================
--- wc/bar (revision 2)
+++ wc/bar (revision 3)
@@ -1,7 +1,7 @@
 const char*email[]={
   "foo@bar.com",
   "zig@zag.com",
- "bif@bof.com",
+ "new_bif@bof.com",
   NULL
 };
$ svn merge -r 2:3 wc/bar wc/foo
U wc/foo
$ svn diff wc/
Index: wc/foo
===================================================================
--- wc/foo (revision 3)
+++ wc/foo (working copy)
@@ -1,7 +1,7 @@
 const char*email[]={
   "foo@bar.com",
   "new_zig@zag.com",
- "bif@bof.com",
+ "new_bif@bof.com",
   NULL
 };

-- 
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 01:45:24 2003

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