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

Re: [TSVN] Re: Big Merge Push (was: [TSVN] Merging from deleted branch to trunk)

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-01-19 21:27:20 CET

Joseph Galbraith <galb@vandyke.com> wrote on 01/19/2005 03:20:06 PM:

> Norbert Unterberg wrote:
> > Mark Phippard schrieb:
> >
> >>> Would it be unreasonable for TSVN to (optionally of course) stick
> >>> a property in that recorded the merge path and revesion number.
> >
> >
> > svk (http://svk.elixus.org/) is said to have merge tracking, and uses
> > the subversion file system. Maybe it is worth a look how svk tracks
the
> > merges?
> > All I know is that it also uses properties to store this informtation,
like
> > propname: svk:merge
> > propval: 12345678-87dc-0310-ab16-a9b1c1177255:/local/trac/trunk:796
> >
> > I don't know what these numbers mean, so don't ask!
>
> Well I don't know either, but they gave me an idea :-)
> The propval could be a sequence of:
>
> MergeTarget=url://repos/project/branch
> MergeLeftURL=url://repos/project/trunk
> MergeLeftRev=100
> MergeRightURL=url://repos/project/trunk
> MergeRightRev=HEAD
> HEAD=200
>
> MergeTarget=url://repos/project/cool-branch
> MergeLeftURL=url://repos/project/branch
> MergeLeftRev=100
> MergeRightURL=url://repos/project/branch
> MergeRightRev=HEAD
> HEAD=200
>
> Then, TSVN only updates the section that matches
> the MergeTarget it is working in.
>
> How good is merge on properties? Would this cause
> conflicts, or would we expect changes like this
> to be able to merge successfully w/o conflicts.

I do not think Subversion merges the contents of properties. If you
change one property, and I change a different one, I THINK it will merge
that for you. Anything else and it is a conflict.

If you look down this page, you will see a section that describes it.

http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.2

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 21:28:00 2005

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