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

RE: resolve conflict dialog is confusing

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 1 Sep 2010 16:48:39 -0400

> On Sep 1, 2010, at 2:14 PM, Tom von Alten wrote:
> > Dave Huang replied:
> >> Merges aren't done on branches in the repository though--they're
> done
> >> between a working copy and the repository. When you do a merge,
> you
> >> generally only specify a single repository URL...
> >
> > I take that as an answer for the "Merge a range of revisions"
> > interface,
> > "Repository" means the one and only one Repository I pointed to
> > explicitly,
> > just ignore the fact that my action is on a working copy of
> something
> > that
> > points to a different repository.
>
> 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.

I'm not sure that is really 100% correct. My understanding of a merge is that a diff is taken of two locations and that diff is applied to your current working copy. From the red-bean svn book:

---
"The main source of confusion is the name of the command. The term "merge" somehow denotes that branches are combined together, or that some sort of mysterious blending of data is going on. That's not the case. A better name for the command might have been svn diff-and-apply, because that's all that happens: two repository trees are compared, and the differences are applied to a working copy."
---
So, you can merge the diffs between the paths of two different repositories. I don't recall when it was added that you can diff separate repos... but I think it has been doable since some time after 1.5.
BOb
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654275
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-01 22:48:55 CEST

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