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

Re: [TSVN] what happened to the default merge From URL

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-06 17:28:04 CEST

Daniel Atallah wrote:
> I do understand the logic of displaying the history in the From URL,
> but for our usage (which I'm guessing is pretty common), the current
> functionality is somewhat non intuitive.

Seems we are missing a common use case then.

> Like many projects that are in a production environment, for our
> current release, we have a "stable" branch and a "testing" branch.
> Bugfixes and enhancements and developed against the testing branch.
> What happens when a change is ready to be deployed to our production
> servers, is that we merge the specific changes from the testing branch
> to the stable branch. These changes are usually several revisions,
> but are not necessarily sequential. Because we are working with a
> codebase that is quite large, and these changes are often isolated to
> a small sub section of the project, the merge is often done on
> specific sub directories, or even files. The fact that we're
> frequently merging at many different levels makes the history listing
> in the merge dialog less useful for us because the default URL is
> almost always "wrong" and requires two changes - (it needs to be
> updated to point at the current working copy and then the branch name
> changed).

I don't really understand why your 'From:' URL wants to be the same as
the WC URL. Maybe I've got that bit wrong, but if you could provide a
worked example then we might understand your use case better. If you can
give us some real paths and revision numbers it would help. Maybe your
repository structure is different from what I have assumed.

> I hope that I'm not stepping on anyone's toes here

Not at all ;-)

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jul 6 17:28:23 2005

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