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

Re: How to get history of merged-in branches in trunk?

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2007-11-20 17:29:55 CET

On Nov 20, 2007 7:47 AM, Ian Wood <Ian.Wood@sucden.co.uk> wrote:

> Hi Marko,
> Because those commits occurred on another path - the only commits you will
> see on the Trunk relating to the Branch will be those made to commit the
> merges you have done from that Branch.
> To see the changes made to the Trunk and the Branch you need to look at
> the history from a level up
> Cheers
> Ian
> -----Original Message-----
> From: Marko Kaening [mailto:mk362@mch.osram.de]
> Sent: Tue 20/11/2007 13:27
> To: users@subversion.tigris.org
> Subject: How to get history of merged-in branches in trunk?
> Hi,
> assume creating a branch and develop it further seperately from trunk.
> At a later time changes made are merged into trunk.
> Now let's check the history of files in trunk.
> Why are the changes made within the branch invisible?
> Marko

However, if you use svnmerge.py script, it will do some work for you. I
believe what it does is:
- it will get the log messages from the branch (for the revisions that are
merged to trunk)
- and when it merges those revisions to trunk, it will use the consolidated
log messages as one large log message for the revision in trunk where the
merge was committed.

In addition, version 1.5 of svn will have most of the svnmerge.py features
incorporated into the software.

-Hari Kodungallur
Received on Tue Nov 20 17:30:46 2007

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.