Re: "multi-part" merge with conflicts does not "bail out with an error message"

On Fri, Nov 14, 2008 at 6:08 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>
> The problem is that your original message does not contain anything
> useful for someone to look at. Clearly from the conflict you show you
> have a test case you are running. So if you want someone to look at
> what you are seeing post the transcript that leads to the unexpected
> behavior.
>

If the file with nested merge parts looks wrong here is steps for reproduce:

0. Configuration: windows XP sp2 pro eng; svn, version 1.5.4 (r33841)

1. Preparation -------------------------

svnadmin create repo

call :CallPrepareSvnPath pathRepo file:///%CD%/repo
svn checkout %pathRepo% work

mkdir work\trunk
svn add work\trunk

echo 11111 >work\trunk\file
svn add work\trunk\file

svn commit work -m "initial"

svn copy work\trunk work\branch
svn commit work -m "branched"

echo bbbbb >work\branch\file
svn commit work -m "file = bbbbb"

echo 22222 >work\trunk\file
svn commit work -m "file = 22222"

echo 33333 >work\trunk\file
svn commit work -m "file = 33333"

echo 44444 >work\trunk\file
svn commit work -m "file = 44444"

2. Reproducing --------------------------

rem /* change 5 skipped to make multi-part merge */
svn merge --accept postpone -c 4 -c 6 %pathRepo%/trunk work\branch ||
echo ERROR !!!!

type work\branch\file

3. If it helps I can attach script file
(NonStoppedMultiPartConflictsMerge.cmd) but it works under winXP :)

> If possible you should also run your test transcript with a recent
> trunk build to see if it is still reproducible.

It possible but I don't know where recent trunk build for windows is?
It is difficult to make this build myself.

--
Thanks
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org