[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 19:27:05 CET

Joseph Galbraith <galb@vandyke.com> wrote on 01/19/2005 01:14:21 PM:

> Would it be possible to get around this problem by properly
> timing the 'property' update. I.e., TSVN first performs the
> merge operation, potentially updating the 'merge parameters'
> property with the information from the branch.
>
> However, it then 'overwrites' the property, potential pulled
> with the merge, with the correct information for the merge
> now being performed. (TSVN might have to silently resolve
> conflicts in the 'merge parameters' property.) I guess
> this might cause problems if a merge were ever done outside
> of TSVN though.
>
> This case definitely complicates things.

I think you would still get a property conflict and those are handled kind
of "oddly". It would be difficult to auto-resolve because there could be
other properties.

> What are the constraints on a property name? Another
> potential resolution would be to embed the MD5 hash
> of the relative path of the merge target in the property
> name.

Not sure, but I was thinking an MD5 hash would also work. I have not done
much with them, if I generate one in Java and someone else in C do we get
the same value?

> I would have just always resolved HEAD to it's real revision
> number:

I was thinking it could be useful to know they specified HEAD for when you
re-populate the dialog. If you specified HEAD last time, there is a good
chance you will the next time. Especially when merging between different
URL's. Either way you would have to determine the value of HEAD, and that
is the complicator.

> > FromURL=url://repos/project/branch
> > FromRev=100
> > ToURL=url://repos/project/branch
> > ToRev=200
>
> But it doesn't really matter (especially since I definitely
> don't have the expertise w/ SVN or TSVN to implement
> anything.)
>
> Can the property change be done in the WC so that it
> gets comitted at the same time as the rest of the merge?

That is not the issue. The property change would commit with the merge,
it is just that the commit will often fail because the folder with the
property change is out of date. When you are just doing a merge, as long
as the merged files are up to date you can still do the commit. I am not
sure this would be a big problem, it is just a slightly-icky side-effect.

I do think there are a lot of advantages to using properties.

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 19:28:46 2005

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