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

svn log -g doesn't return merge info when operating against repository root

From: Justin Johnson <justin_at_justinjohnson.io>
Date: Wed, 25 Jul 2012 11:17:55 -0500

Hello.

The command "svn log -vg" is not returning merge info when I execute
the command while sitting in a working copy of the root level of a
repository or when I pass in the URL to the root level of root level
on the command line. A simple test case can be seen below.

I see there is already an issue related to faulty merge history logic
(3235), but it isn't apparent that it is related to what I'm seeing.
Is this a known bug?

Justin

$ svn --version
svn, version 1.7.5 (r1336830)
   compiled Jul 11 2012, 13:58:27

Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people; see the NOTICE
file for more information.
Subversion is open source software, see http://subversion.apache.org/

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
  - handles 'http' scheme
  - handles 'https' scheme

echo "## Create repo ##"
svnadmin create repo

echo "## Add initial project ##"
svn co file://`pwd`/repo wc
cd wc
mkdir -p p/trunk p/branches
echo hi > p/trunk/file.txt
svn add p
svn ci -m "initial import"

echo "## Copy trunk to A and make changes ##"
svn cp p/trunk p/branches/A
svn ci -m "Create branch A"
echo hello >> p/branches/A/file.txt
svn ci -m "Changes on A"
svn up

echo "## Merge A to trunk ##"
cd p/trunk
svn merge "^/p/branches/A"
svn ci -m "Commit merge results"
svn up

echo "## Log from WC - trunk ##"
svn log -vg
cd ../..

echo "## Log from WC - repo root ##"
svn log -vg
cd ..

echo "## Log from URL - repo root ##"
svn log -vg file://`pwd`/repo
Received on 2012-07-25 18:18:32 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.