[darcs-devel] [issue1190] When replace patches and hunk patches conflict there are no marked conflicts

[Jason Dagit]

New submission from Jason Dagit <dagit at codersbase.com>:

The following script demonstrates the problem.  What happens is that hunks which
conflict with replaces do not get marked up.  Probably the biggest problem is
that the result is very confusing.

The script below could probably be simplified.  I was actually chasing a
slightly different problem with replace patches and this script almost hits that
case but not quite.

\begin{bash}
rm -rf temp1 temp2

mkdir temp1
cd temp1
darcs init
echo "Line1" > foo
echo "Line2" >> foo
echo "Line3" >> foo
echo "Line4" >> foo
echo "3eniL" >> foo

darcs add foo
darcs record -am 'foo1'

cd ..

darcs get temp1 temp2

cd temp2

darcs replace Line1 1eniL foo
darcs replace --force 3eniL Line3 foo
darcs record -am 'replaces'

cd ../temp1

echo "Line1" > foo
echo "Line2" >> foo
echo "edityou" >> foo
echo "Line4" >> foo
echo "3eniL" >> foo

darcs record -am 'edityou'

cd ../temp2

darcs pull -a ../temp1
\end{bash}

----------
messages: 6553
nosy: dagit, dmitry.kurochkin, kowey, simon, thorkilnaur
priority: bug
status: unread
title: When replace patches and hunk patches conflict there are no marked conflicts

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1190>
__________________________________