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

RE: Re: TSVN 1.8.6 & merge conflict, prefer repository => wrong behavior: chooses local

From: Panu Outinen <panu.outinen_at_vertex.fi>
Date: Sat, 10 May 2014 08:05:27 -0700 (PDT)

> On 08.05.2014 10:56, Panu Outinen wrote:
> > Hi!
> >
> > I'm running TortoiseSVN 1.8.6, Build 25419 - 64 Bit on Win7 x64 English.
> > Server running Subversion 1.7.17 (Centos 6 x64)
> > svn protocol
> >
> > Situation: unmodified branch working copy, merging "3rd party vendor
> > tree" changes into the branch through TSVN's "Merge a range of
> > revisions" operation, one r-version chosen, defaults on the merge
> > options (Working copy, only compare whitespaces checked) and there's
> > going to be bunch of files/folders modified/added/deleted and only
> > one conflict on a zip thus a binary file => TSVN's Resolve Conflict
> > dialog comes up.
> >
> > Now if I choose "Prefer repository" the conflicted file is NOT going
> > to be the file on repository it will be the local version! Naturally
> > with the choose of "Prefer local" this will happen as well.
> >
> > This can be repeated and e.g I can see with Windows Explorer that
> > there are 3 files correctly in the folder before pressing a button to resolve:
> > atlassian-bundled-plugins.zip
> > atlassian-bundled-plugins.zip.merge-left.r637
> > atlassian-bundled-plugins.zip.merge-right.r638
> >
> > This errorneous behavior won't happen if I choose Resolve later and
> > e.g. from the same dialog jump to the conflicted one and choose
> > Resolve conflict with 'theirs'!
> I think this is a misunderstanding of what "Prefer repository" will do.
> It will not (as you noticed) replace the file with the one in the
> repository! It will only use the *conflicted part* of the file from the
> repository.
> So if in a thousand line file only two lines are in conflict, then only
> those two lines will be replaced with the same lines from the repo file.
> The rest of the file will stay as is, which is the local one.
> If you resolve a conflict after the merge using "Resolve conflict with
> 'theirs'", then that function uses the complete repository file, not
> just the conflicted parts.
> Stefan

Well, if one clicks the Help button in the dialog the online manual states the following:

4.20.6. Handling Conflicts during Merge
"If your merge includes binary files, merging of conflicts in those is not possible. You have to choose one complete file. Use Prefer local to select the local version as it was in your working copy prior to the merge, or Prefer repository to select the incoming file from the merge source in the repository. "

And like I said this works as above in version 1.7.13

  - Panu


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-10 17:05:38 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.