[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Unexpected conflict that resolves intself

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 11 Jun 2009 15:01:03 +0100

On Thu, Jun 11, 2009 at 02:27:19PM +0100, Giulio Troccoli wrote:
> > > svn: Commit failed (details follow):
> > > svn: Conflict at '/dip/1.61/test/src'
> >
> > What do these commands print?
> >
> > svn status /dip/1.61/test/src
> > svn info /dip/1.61/test/src
>
> And of course, as per Murphy's Law, I cannot reproduce the problem
> anymore. However, svn status shows something like
>
> M src
> M src/dip/client/dipClientMain.c
>
> Which confirms to me that it's a property conflict, i.e. mergeinfo as
> we don't have any other properties on directories.

Yes.

> BTW, my merge command was
>
> svn merge -c<revision> --accept postpone <REPO_URL> src

That looks fine.

> But I have also tried with
>
> svn merge --non-interactive -c<revision> <REPO_URL> src
>
> > > Even more weird is the fact that if I don't do anything and
> > simply try
> > > the merging again then everything is fine.
> >
> > Conflicted items are skipped if you try to merge again.
>
> True, but. When the commit fails my script does an error recovery too,
> i.e. issues
>
> svn revert --non-interactive --depth=infinity src svn update
> --non-interactive --depth=infinity src
>
> And then it removes all unversioned files (which theoretically are new
> files added by the merge)
>
> So, I don't see how the next time the conflict does not happen again.
> In my view the WC is returned to the exact same state as before the
> merging, so whatever cause the conflict should still be there. Clearly
> I'm missing something.

You probably still have mergeinfo changes in the working copy after
you reverted? Check with 'svn status'.
If the mergeinfo changes are still present, try passing -R to 'svn
revert'. That should get rid of them.

> Why do you need the svn info too? I'm just asking becuase I'm testing
> on a VM and AFAIK I cannot copy and paste, so if I know what you're
> after I can tell you.

'svn info' is used to query detailed information about tree conflicts.
If an item is a tree conflict victim, you can see the URLs of the
item as it existed on the merge left and merge right with svn info.

For a small introduction to tree conflicts, which are new in 1.6, see
http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html

You don't seem to have a tree conflict during the merge. I was
asking for 'svn info' output in case you had a tree conflict.

Stefan
Received on 2009-06-11 16:03:04 CEST

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