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

RE: Which branches this file belong to?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-10-03 18:45:48 CEST

> From: Corrado Labinaz [mailto:corradolab@ngi.it]
> Sent: Tuesday, October 03, 2006 6:08 AM
> To: users@subversion.tigris.org
> Subject: Which branches this file belong to?
> Hi,
> suppose you have file trunk/myfile.c
> It goes through these modifications:
> revision
> 100 file created
> 150 copied to branches/release1
> 200 copied to branches/release2
> 230 copied to branches/release3
> 250 fixed bug
> Well, AFAIK it's not possibile to get the above list.
> If I use "svn log trunk/myfile.c" I get
> 100 file created
> 250 fixed bug
> while if I execute i.e. "svn log branches/release2/myfile.c" I
> 100 file created
> 200 copied to branches/release2
> Why do I need the full list?
> Because after applying the bugfix at revision 250, I need to
apply the same bugfix to older releases.
> "svn copy trunk/myfile.c branches/release1" should be enough
most of the time.
> But I don't know which releases to copy to (release1, 2, 3, all
of them or none of them?)
> (BTW this was easy with CVS, where every file get tagged with
the branch number it belong to)
> Is there a way to get the full list above?
> Kind regards,
> Corrado

Summary: (In general) merging trunk/.../myfile.c to
release1/.../myfile.c is bad. Merging trunk to release1 is good.

It's easy with CVS since each file object contained all the branches, so
it was easy for branch A to know about branch B. In Subversion, once
you create a branch, the parent branch has no references to the child
branch. However, the child branch is aware of the parent branch
(specifically the branch point.)

SVN is more oriented to operating on entire directory trees. Instead of
focusing on individual files, it's "better" (in general) to think in
terms of merging trunk to release1. Since SVN doesn't do merge
tracking, it's painful to merge dozens of individual files, instead of
merging by entire branches/directory trees.

You, the user, know that you have three releases and a trunk. Therefore
you already know that you need to merge the trunk fix to the release
branches. The real question is whether you:
a) merge the fix from the trunk to each release (trunk -> release1,
trunk -> release2, etc.) or
b) merge from trunk -> release1 -> release2 -> release3 (release2 gets
the fix by merging in release1)


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA623

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 3 18:47:00 2006

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.