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

Re: Merging or moving from "trunk" to a branch.

From: Stephen McConnell <mcconnell_stephen_at_yahoo.com>
Date: 2005-02-22 22:06:10 CET

I've tried to use merge, but although it says it has merged (I'm
merging from trunk to my branch), nothing has happened. I'm using
Tortiose and trying to use Subclipse to do the merges... nothing
happens.

Stephen McConnell
--- Ben Collins-Sussman <sussman@collab.net> wrote:

>
> On Feb 22, 2005, at 2:38 PM, Max Bowsher wrote:
>
> > Stephen McConnell wrote:
> >> I need to be able to move individual files from the "trunk" to a
> >> branch.
> >>
> >> I have tried merging it, but that doesn't work. The only way I
> seem
> >> to
> >> be able to do this is to delete the file in the branch and "copy"
> the
> >> file to trunk. BUT this creates a new revision number...
> >>
> >> Is there a way that I can get a file copied from trunk to the
> branch
> >> and keept the same revision number on the file??
> >
> > NO! Doing so would violate one of Subversion's core principals - a
> > revision, once committed, *never* changes.
> >
>
> I think Stephen is quite getting the idea that Subversion doesn't
> expose per-file revision numbers to users. Files don't get copied
> from
> branch to branch. Instead, *changes* get duplicated. That's what
> 'svn
> merge' is all about.
>
>

=====

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 22:08:33 2005

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

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