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.
Thanks,
Joseph
---------------------------------------------------------------------
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:22:55 2005