You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Juergen Baetz <J....@intershop.de> on 2008/01/08 10:51:34 UTC
svn merge --record-only (svn1.5beta)
Hello,
I built and set up the 1.5 beta svn (/trunk) for testing some new merge tracking features.
I need the possibility to stick merge infos at (history-)revs after imported from ClearCase.
How do I use the --record-only option for svn merge?
As I understood the option should only change the mergeinfo property in an old revision _without_ committing a new revision.
Example:
I wish to record a merge from revision 3 in the revision 5 of /bla.txt.
svn merge -r 3:5 https://server/svnrepo/bla.txt
But no output in the shell and by running "svn pl -vR /bla.txt"
Jürgen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge --record-only (svn1.5beta)
Posted by Mark Phippard <ma...@gmail.com>.
On Jan 8, 2008 5:51 AM, Juergen Baetz <J....@intershop.de> wrote:
> I built and set up the 1.5 beta svn (/trunk) for testing some new merge tracking features.
>
> I need the possibility to stick merge infos at (history-)revs after imported from ClearCase.
> How do I use the --record-only option for svn merge?
> As I understood the option should only change the mergeinfo property in an old revision _without_ committing a new revision.
No, that is not what it does. It updates the mergeinfo property in
the working copy and you then would have to commit that property
change. It does not alter history in the past (Subversion does not
allow that). What it does is not actually do any merge. It just
updates the recorded merge tracking information.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org