Re: Branching

> Before a few mintues I modified a file in the trunk which is
> in all branches. After the commit I did a svn up in one of
> the branches. The only feedback I got was "At Revision 48" -
> noting else. A look in the files showed no modification. svn
> up again did nothing.
>
> It seems like the branch recognized a change, made a new
> Revision (from 46 to 48), but no changes to the file were made. Why?
>
> When this works I'll do a branch of a branch and look what
> will happen :-))
>
> Thanks!
> Markus

Markus,

Hmm, it seems like a revision control system should be able to
help you out here.

Let's make this a learning experience. Especially for me.

DISCLAIMER: Use at your own risk. Your mileage may vary. Etc.

If I read the docs right, I think you should be able to merge
changes from the trunk into the branches something like this:

 Let RT1 = repository revision before FILE in trunk changed
 Let RT2 = repository revision after FILE in trunk changed

  svn merge -rRT1:RT2 URL:/repo/trunk/FILE /working/branch1/FILE
  svn merge -rRT1:RT2 URL:/repo/trunk/FILE /working/branch2/FILE
  svn merge -rRT1:RT2 URL:/repo/trunk/FILE /working/branch3/FILE
  ...

Then you should see some changes in FILE your various working
branches 1, 2, 3, ... and then you can take a look at, fix, and
commit them as needed.

Note I'm suggesting you do the merge on a file-by-file basis, but
you could always do it by directory or complete branch if you knew
you wanted to merge all the changes between RT1 and RT2 into the
branches, but only you would know if that would be appropriate.

Please let us know if you try it.

Raye.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 26 05:05:00 2004