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

Re: Hello, and a branch/merge question

From: Pawel Rozanski <tokugawa_at_afn.no-ip.org>
Date: 2004-01-13 06:24:04 CET

sussman@collab.net wrote:
> Why would you lose data? If you commit a bunch of changes to
> Project/trunk/sub/, you can always "merge" them back into the original
> sub/trunk if you want to. Just compare two different versions of
> Project/trunk/sub with each other, and merge the differences into a working
> copy of sub/trunk. That's exactly what the 'svn merge' command is for.

Yes, I'm aware of that.. but i will not have a log about it, It will be
only seen as another commit .. so i suppose i have to manually add
property "this is from branch X.Y"

> It sounds like you want the *exact* same history to exist in both sub/trunk
> and in Project/trunk/sub. I'm not sure why that's important to you. As the
To make other type of tag..

sub/trunk:3 from Project/trunk/sub:2
-- imported stable from main line of devel at r3 --
sub/trunk:30 from Project/trunk/sub:29
-- imported stable from main line of devel at r30 --

and have that as 'svn logs' not my comments for commit
But it doesn't matter...I'll use properties to achieve my task

> changesets in Project/trunk/sub whenever you wish. There's no reason for
> every changeset to exist as an individual commit on both branches; what
I agree, but I wrote what i wanted above :)

(this is nomal way ... not my werd idea)
$ svn log -r19 -v B/plik
r19 | y | 2004-01-13 05:42:52 +0100 (Tue, 13 Jan 2004) | 2 lines
Changed paths:
    A /B (from /A:18)

so svn remebers my copy (creating branch)
but ...
$ svn log -r22 -v A/plik
r22 | y | 2004-01-13 05:50:42 +0100 (Tue, 13 Jan 2004) | 2 lines
Changed paths:
    M /A/plik

imported from B
and no more ,. only my comment... so.

$ svn proplist -v plik
Properties on 'plik':
   from : B:22

thx for that properties
simple shell alias will help me :)

Thanks, for so fast answer... this really helped me

And for my curiosity, How cost is for merge action ? I can understand
notatnion, and copy is O(1).. but merge ? I suppose if i make change in
branch B, and merge it back to A.. then i will have double data (changes
for B, and one big change for merging into A)

Am I right? Or is this even more smarter?

again, thx,

P.S. I'm on the list, so post to list only.. (it will make easier to
      send threadable reply )

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 13 06:22:36 2004

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.