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

RE: Re: Merge question

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: 2007-09-21 01:31:09 CEST

Thanks for the info...

It originally came up as a question from on of the users here. He
thought he needed to do the merge and didn't know what the 'G' status
was. When I investigated what was going on, I discovered that he had
the changes already and didn't actually need to do anything. However, I
still couldn't answer the question as to what the 'G' status meant so I
thought it was worth a question here.

I think either the second merge should not report anything or the
documenation should be update (just my 2 cents worth)


> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2007b@ryandesign.com]
> Sent: Thursday, September 20, 2007 5:19 PM
> To: Brian Erickson
> Cc: subversion-users
> Subject: Re: Merge question
> On Sep 20, 2007, at 15:42, Brian Erickson wrote:
> > 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/trunk@165 .
> That means "compute the difference between trunk at revision
> 164 and trunk at revision 165, and apply those changes to the
> current working copy"
> > And get the following output
> >
> > U pcs\core\ipc\srv_prio.c
> >
> > That's cool, exactly what I expected.
> Ok, so that file was updated with the changes that occurred
> on the trunk between revision 164 and 165. Your working copy
> now has those modifications in it, and you can test and
> commit them at your leisure.
> > 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.
> Not sure why you're doing the merge a second time, or what
> you expect to happen. But what's happening is that Subversion
> is computing the difference between revision 164 and 165 on
> trunk, again, and applying it to your working copy, again.
> The "G" status is like the "U" status except that "G" means
> that the file already had modifications at the time you
> executed the merge command. And in fact, the modifications
> that had already been done to the file (by the first merge)
> are exactly the same changes that the second merge would do.
> Therefore, there are now no additional changes to the file.
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 21 01:31:44 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.