Merging complex project

[madla]

I have a fairly complex project merge. There are a few hundred revisions since I branched off. Two issues I run into after starting the merge (with all the revisions).

Resolving conflicts isn't working as expected with files that have been changed in a few revisions. I see conflict markers in the working copy in my diff tool (tried TextWrangler, FileMerge, DiffMerge) that are considered regular text. When I do the merge from my colleages computer using Tortoise - no conflict markers...

Am I using the wrong Diff tools? 

Is there something I need to do first?

After I figured out all the conflicts, SVNX won't let me commit my changes. It complains that one of my 'Folder'/tree conflicts needs to be resolved but SVNX won't let me do anything with that folder (can't even revert it).

Not sure what information is needed to figure out what I'm doing wrong.

Thanks in advance...martin

[chris]

Hello Martin,

I’m going to assume you are using svnX 1.3 & Subversion 1.6.x.

On May 8, 8:33 pm, madla <martin.tscho...@gmail.com> wrote:
> I have a fairly complex project merge. There are a few hundred revisions
> since I branched off. Two issues I run into after starting the merge (with
> all the revisions).
>
> Resolving conflicts isn't working as expected with files that have been
> changed in a few revisions. I see conflict markers in the working copy in my
> diff tool (tried TextWrangler, FileMerge, DiffMerge) that are considered
> regular text. When I do the merge from my colleages computer using Tortoise
> - no conflict markers...

Well, I don’t know what merge parameters you are using, but svnX
defaults to setting --accept=postpone,
which means Subversion would add conflict markers as necessary. You
can change this in the Merge sheet.
Getting "no conflict markers" is not necessarily a good result if
there are actual conflicts.
If this is the case then Tortoise is making decisions regarding
conflicts without consulting you.
Note that svnX does not decide if conflicts exist or not, Subversion
does.

> Am I using the wrong Diff tools?

The diff tools don’t add or remove conflict markers.
Conflict markers are added by `svn merge` or `svn update`.
It is down to you to manually remove them however you want to do it.
FileMerge & DiffMerge also support a 3-way merge for a Conflicted file
via svnX’s `Resolve` button.
But you can’t be referring to that as TextWrangler isn’t used there as
it doesn’t support 3-way merging.

> Is there something I need to do first?

Yes. Get the Subversion book from http://svnbook.red-bean.com> and
read the “Branching and Merging” chapter.

> After I figured out all the conflicts, SVNX won't let me commit my changes.
> It complains that one of my 'Folder'/tree conflicts needs to be resolved but
> SVNX won't let me do anything with that folder (can't even revert it).

You can’t commit because you still have conflicts, tree conflicts.
Unfortunately, svnX 1.3 doesn’t know about tree conflicts & therefore
doesn’t display specific info.
Note that resolving tree conflicts may reveal further conflicts.
[Tree conflicts were new in Subversion 1.6.]

> Not sure what information is needed to figure out what I'm doing wrong.

You should read the Subversion documentation relating to tree
conflicts
<http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html>.
It is important that you understand what they are & why you are seeing
them.
Then you can decide how to resolve them (which may require executing a
command or 2 directly with `svn` before continuing with svnX).

Regards,

Chris

[madla]

Yes, your assumption is correct svnX 1.3 & Subversion 1.6.x.

Looks like I got some reading to do. Thanks...martin

> Yes.  Get the Subversion book fromhttp://svnbook.red-bean.com> and