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

Re: How to preserve history and log messages when merging?

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 16 Jul 2008 15:32:41 -0400

On Wed, Jul 16, 2008 at 3:39 AM, Andrey <andrey.s73_at_i.ua> wrote:
> My problem is following.
> I'm working on a repository MyProj/Trunk. Then I've made a branch
> MyProj/Branches/v0.1 which contains revisions 1..100. Later, some
> bugfixing was performed. I used log messages to describe the nature of
> the bug and refer to the bug tracking system.
> MyProj/Trunk
> rev. 101: Bug 12345 fixed
> rev. 102: Bug 12346 fixed
> rev. 103: Bug 12347 fixed
> Then, I'd like to merge those 3 revisions into the branch. If I
> followed the process suggested in Subversion manual, I'd end up with
> rev.101 in the branch which contans all the changes from rev.101..103
> in the trunk.
> MyProj/Branches/v0.1
> rev. 101: Merged rev. 101..103 from the trunk
> But I need to exactly preserve history and log messages in the branch,
> therefore I have to merge and commit one by one, manually copying log
> messages.
> Could you please give some hints how to automate this process?

You would actually get r104 in the branch. The revision number is
global. If you use SVN 1.5, you get this feature. You need to use
svn log -g, which will show you r104, just as it does today, but then
will go on to show the revisions that you merged in r104, along with
their log messages.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-16 21:36:09 CEST

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.