Re: resolve conflict dialog is confusing
From: David Huang <khym_at_azeotrope.org>
Date: Wed, 1 Sep 2010 14:49:09 -0500
On Sep 1, 2010, at 2:14 PM, Tom von Alten wrote:
I'm not sure what you mean by "my action is on a working copy of something that points to a different repository." You can't merge between two repositories. The merge source is the repository, the merge destination is your local working copy, which was created from that same repository.
> In the case of conflicts between those 2 source URLs, how does a
Not sure what you mean by "conflicts between those 2 source URLs". It doesn't make sense to talk about a conflict there. Maybe you're confused about the merge process in general? In which case, perhaps the Subversion manual (rather than the TortoiseSVN manual) would be a good place to start: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html
Merging can be though of taking a diff between two revisions of the repository as the "source" and applying that diff as a patch to your working copy. For a simple merge that you only need to specify one repository URL for, SVN takes a diff between rev X of that URL and rev Y of that URL and applies it to your working copy. For the merge that takes two repository URLs, SVN takes a diff between rev X of URL 1 and rev Y of URL2 and applies *that* to your working copy. But the two URLs are just used to generate a diff, so there's nothing that can conflict at that point.
> At the bottom of the "Merging" help file, there's a section "Handling
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-conflict-callback is what I was referring to, and it sounds like that's what you're talking about too. There is no "which repository"--there's only one repository.
-- Name: Dave Huang | Mammal, mammal / their names are called / INet: khym_at_azeotrope.org | they raise a paw / the bat, the cat / FurryMUCK: Dahan | dolphin and dog / koala bear and hog -- TMBG Dahan: Hani G Y+C 34 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++ ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654213 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2010-09-01 21:49:25 CEST
This is an archived mail posted to the TortoiseSVN Users mailing list.