Merging - why do I need a path ?

["Shakespeare, Simon (Pensions)" <Si...@capita.co.uk>]

Hi - Can anybody explain to why when doing a merge you need to enter the path in the following manner:

svn merge --dry-run -r 40:41 svn://ipofserver/phoenix/trunk/gui/mpa c:/scstest/hiptapp/mpa

I'm trying to merge the commit that resulted in revision 41 - surely subversion knows what path(s) in the repository that revision 41 related to so why can't I just enter svn://ipofserver - I can sort of undertand why I need to enter a destination path for my working copy but am a confused what happens if revision 41 included several files in different directories - do you just use the top most path as the path for your working copy.

The reason I wanted to do this was to try & simplify my merging. When I do a commit I store that revision against a ticket number in a database & assumed that it would have been sufficient just to store the revision number rather than all the paths.

Thanks - Can you include me in the reply as I not a member of the users mailing group - well I was but I got swamped with emails & my boss wasn't happy !

Simon

**********************************************************************************
This email and any files transmitted with it are confidential, and may be subject to legal privilege, and are intended solely for the use of the individual or entity to whom they are addressed.  
If you have received this email in error or think you may have done so, you may not peruse, use, disseminate, distribute or copy this message. Please notify the sender immediately and delete the original e-mail from your system.

Computer viruses can be transmitted by e-mail. Recipients should check this e-mail for the presence of viruses. The Capita Group and its subsidiaries accept no liability for any damage caused by any virus transmitted by this e-mail.
***********************************************************************************

Re: one repository root vs multiple - security wise? (was Merging - why do I need a path ?)

[William Nagel <bi...@stagelogic.com>]

Gabriel,

Please take a look at http://subversion.tigris.org/mailing-list- 
guidelines.html, "Making a fresh post"


> Hi all,
>
> Which scenario is better, security wise?
>
> One repository : /svnroot
> and every project has it's own directory, protected using linux  
> rights (repository accessed via ssh) to secure each one?

There is no way to create project-specific rights using svnserve.  If  
you want finer-grained access control, you'll need to use Apache as  
your server.   (That's at least true as of 1.2, I haven't followed  
the changes that are slated for the soon-to-be-released 1.3 that  
closely)

>
> or
>
> a repository for each project, protected using linux rights?

I find multiple projects to be cleaner, although not necessarily  
"more" secure, depending on how you set up repository access.

-Bill

>
> Thank you,
> Gabriel
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

one repository root vs multiple - security wise?

[Gabriel Rossetti <ro...@charter.net>]

Hi all,

Which scenario is better, security wise?

One repository : /svnroot
and every project has it's own directory, protected using linux rights 
(repository accessed via ssh) to secure each one?

or

a repository for each project, protected using linux rights?

Thank you,
Gabriel

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging - why do I need a path ?

[William Nagel <bi...@stagelogic.com>]

Hi Simon,
> Hi - Can anybody explain to why when doing a merge you need to  
> enter the path in the following manner:
>
> svn merge --dry-run -r 40:41 svn://ipofserver/phoenix/trunk/gui/mpa  
> c:/scstest/hiptapp/mpa
>
> I'm trying to merge the commit that resulted in revision 41 -  
> surely subversion knows what path(s) in the repository that  
> revision 41 related to so why can't I just enter svn://ipofserver -  
> I can sort of undertand why I need to enter a destination path for  
> my working copy but am a confused what happens if revision 41  
> included several files in different directories - do you just use  
> the top most path as the path for your working copy.

You need to specify the source path/url because Subversion allows you  
to merge from one base to another.  For instance, if you wanted to  
merge from /branch/branch1 to /trunk, you need to tell Subversion to  
use /branch/branch1 as the base to merge from.  The merge command  
will then create a diff for the two supplied revisions and apply that  
diff to the target working copy path.  If you didn't supply the  
source base, Subversion wouldn't have any idea what to use as a root  
for the merge.  Remember that /branches, /trunk, and /tags don't have  
any special meaning to Subversion itself.  They're just directories.   
Any meaning they have is based on your own conventions.

> The reason I wanted to do this was to try & simplify my merging.  
> When I do a commit I store that revision against a ticket number in  
> a database & assumed that it would have been sufficient just to  
> store the revision number rather than all the paths.

Better merge tracking is an oft-requested feature for Subversion, and  
one that is definitely on the roadmap.  It's just that it's a  
difficult problem, and not one that anyone wants to rush into since  
getting it wrong would likely be worse than not having it.

If you want merge tracking now though, you do have some options.  You  
might want to check out svnmerge and/or svk.  Both are projects that  
give you some better merge tracking (svk is much more than that,  
though).

http://www.dellroad.org/svnmerge/index
http://svk.elixus.org/

-Bill

> Thanks - Can you include me in the reply as I not a member of the  
> users mailing group - well I was but I got swamped with emails & my  
> boss wasn't happy !
>
> Simon
>
>
> ********************************************************************** 
> ************
> This email and any files transmitted with it are confidential, and  
> may be subject to legal privilege, and are intended solely for the  
> use of the individual or entity to whom they are addressed.
> If you have received this email in error or think you may have done  
> so, you may not peruse, use, disseminate, distribute or copy this  
> message. Please notify the sender immediately and delete the  
> original e-mail from your system.
>
> Computer viruses can be transmitted by e-mail. Recipients should  
> check this e-mail for the presence of viruses. The Capita Group and  
> its subsidiaries accept no liability for any damage caused by any  
> virus transmitted by this e-mail.
> ********************************************************************** 
> *************


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging - why do I need a path ?

[Kalin KOZHUHAROV <ka...@thinrope.net>]

PLEASE do consider NOT posting HTML to any mailing list.

Shakespeare, Simon (Pensions) wrote:
> Hi - Can anybody explain to why when doing a merge you need to enter the
> path in the following manner:
> 
> svn merge --dry-run -r 40:41 svn://ipofserver/phoenix/trunk/gui/mpa
> c:/scstest/hiptapp/mpa

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.keyconcept

Because this is the syntax basicly :-)

> I'm trying to merge the commit that resulted in revision 41 - surely
> subversion knows what path(s) in the repository that revision 41 related
> to so why can't I just enter svn://ipofserver - I can sort of undertand
> why I need to enter a destination path for my working copy but am a
> confused what happens if revision 41 included several files in different
> directories - do you just use the top most path as the path for your
> working copy.

What about:
svn merge -r 10:10000 $URL $WD
svn applies the changes incrementally, AFAIK, so it needs a space to apply them ($WD)

The rule I follow is to merge only whole branches to trunk (or other branches),
so the path is known.

> The reason I wanted to do this was to try & simplify my merging. When I
> do a commit I store that revision against a ticket number in a database
> & assumed that it would have been sufficient just to store the revision
> number rather than all the paths.
Can you clarify that?

> Thanks - Can you include me in the reply as I not a member of the users
> mailing group - well I was but I got swamped with emails & my boss
> wasn't happy !
Then how do you stay current to the technology?
This is a very informative ML, so talk to your boss, about that. I did it and it worked.

Kalin.
-- 
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org