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

Re: svnmerge script

From: Chris Morgan <chmorgan_at_gmail.com>
Date: 2005-03-10 20:39:46 CET

Thank you for the information about merging issues. I looked through
the document about desired features, sounds like a substantial amount
of work to implement properly. Perhaps I can convince my employer to
fund or otherwise provide time to work on this support, it would save
us quite a bit of time to have this kind of support and likely be
cheaper than moving to bitkeeper.

Chris

On Thu, 10 Mar 2005 14:06:18 -0500, John Peacock <jpeacock@rowman.com> wrote:
> Chris Morgan wrote:
> > Could this merge tracking be stored via the svnmerge-properties
> > property that the svnmerge script is using? Or were you thinking
> > something lower level? As far as features go, is svnmerge what you
> > were thinking of or is this just a portion of the way to the goal of
> > merge tracking?
>
> SVK tracks merges as well and doesn't use anything like what svnmerge
> seems to use (it also works very well). For example:
>
> > $ svk info
> > Checkout Path: /home/jpeacock/devel/subversion-keywords
> > Depot Path: /subversion/local/keywords/
> > Revision: 12863
> > Last Changed Rev.: 12863
> > Copied From: /mirror/trunk, Rev. 12021
> > Merged From: /local/keywords-phase1, Rev. 12278
> > Merged From: /mirror/trunk, Rev. 12861
> >
>
> Whatever eventually goes into the core is likely to require a schema
> change to do it right, rather than hanging it off the properties.
>
> John
>
> --
> John Peacock
> Director of Information Research and Technology
> Rowman & Littlefield Publishing Group
> 4501 Forbes Boulevard
> Suite H
> Lanham, MD 20706
> 301-459-3366 x.5010
> fax 301-429-5748
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 10 20:41:19 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.