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

RE: Merge question

From: Fouts Christopher (QNA RTP PT PREV) <Chris.Fouts_at_qimonda.com>
Date: 2007-09-20 23:08:14 CEST

does "svn merge --help" tell you anything?

From: Brian Erickson [mailto:erickson@BAUERCONTROLS.com]
Sent: Thursday, September 20, 2007 4:42 PM
To: subversion-users
Subject: Merge question

Hi all,

I'm hoping some can educate me or point me to the right spot in the docs...

I execute the following command

svn merge http://snidely/svn/pcs/trunk@164 http://snidely/svn/pcs/trun<http://snidely/svn/pcs/trun>k_at_165<mailto:k_at_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 23:08:40 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.