RE: merging adjacent changes
From: Michal Matyl <Michal.Matyl_at_zf.com>
Date: Wed, 24 Feb 2016 08:44:07 +0000
Hello,
Thanks for paying attention to this. Unfortunately I can't submit new item in SVN's JIRA. Apart from discussion raised by my example can someone please fill an issue for this ? It's already identified by Daniel as a bug. Per his suggestion I have also rewritten the example into Win batch script.
Regards
-----Original Message-----
"Bert Huijben" <bert_at_qqmail.nl> writes:
> Personally I agree that I would like to see a text-conflict raised in
I added the test because we had already, perhaps inadvertently, implemented the behaviour.
Back in 2003 we didn't have 'svn resolve' so resolving a text conflict required the user to edit the file. Now we have 'svn resolved' which may make resolving text conflicts easier. Perhaps that allows us to change Subversion to create more conflicts?
We know merge is essentially imperfect or fuzzy, the question is where to draw the line. Which, if any, of these cases should merge without conflict and what should the merged result be?
1. common first second
A A A
2. common first second
A A A
3. common first second
A A A
4. common first second
A A A
There are probably more cases.
-- Philip Martin WANdisco
|
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.