ansaurus

Question

Answer 1

+10 A:

Is there something that prevents you from merging all revisions on trunk since the last merge?

svn merge -rLastRevisionMergedFromTrunkToBranch:HEAD url/of/trunk path/to/branch/wc

should work just fine. At least if you want to merge all changes on trunk to your branch.

Stefan 2008-12-30 07:15:15

When I dried-run it, there where a lot of "D" and "A" for many files, since the files where moved in the trunk. My question is if SVN remembers the files' histories in this case.

Gilad Naor 2008-12-30 07:27:42

Did you use svn rename when moving files in the trunk? If you did, the history should remain. I think you should try this on a small scale - create a new repository, a trunk with a single file, a branch with a change, do an svn rename on the trunk and check whether history exists.

Yuval F 2008-12-30 07:42:10

How can I know which was the last revision merged from trunk to branch?

Leandro López 2009-10-13 17:46:00

in newer versions of svn it is a stored as a file property (somewhere?, perhaps the root directory). Older version do not store this info, you have to manually search for it. i.e. search the log for the commit of the last merge. (This is a major inconvenvience. Git, Mercurial, Bazaar do not have these limitations)

Ronny 2010-07-14 07:50:54

Answer 2

+1 A:

Last revision merged from trunk to branch can be found by running this command inside the working copy directory:

svn log -v --stop-on-copy

Anonymous 2010-01-31 06:11:53

That just stops the log when the branch was created; it doesn't show any merges that happened after that point.

mos 2010-02-10 20:45:36

ansaurus

tags:

views:

answers:

Subversion merge Trunk to Branch

related questions