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

Merge question

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: 2007-09-20 22:42:17 CEST

Hi all,
I'm hoping some can educate me or point me to the right spot in the
I execute the following command
svn merge http://snidely/svn/pcs/trunk@164
http://snidely/svn/pcs/trunk@165 .
And get the following output

U pcs\core\ipc\srv_prio.c
That's cool, exactly what I expected. Now I execute the exact same
command again and I get:
G pcs\core\ipc\srv_prio.c
The 'G' doesn't appear to be in my copy of the documentation. I found a
reference under the svn update command that says 'merged'. No
modifications are made to the file so I'm wondering what the G means and
what I'm not understanding.
Received on Thu Sep 20 22:42:41 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.