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

Re: [Subclipse-users] problem with merge command

From: Francesco Zanitti <f.zanitti_at_tecnoteca.it>
Date: 2007-11-07 10:56:44 CET

Thanks Mark,
that's quite exactly what i've done.. even using the bash, the messages i
can read are about files "added" and "skipped" (by "skipped" it means that
thay doesn't exists in the target repository..so they are deleted (!) ) ..
no file update, i just don't understand..

so this is the output if i try to merge from the bugfix trunk to the new
development branch:

svn merge --ignore-ancestry
svn://192.168.1.29/cmdball/cmdbuild/trunk/cmdb_at_HEAD
svn://192.168.1.29/cmdball/cmdbuild/trunk/cmdbAlfrescoDev_at_HEAD merge
Skipped 'merge/WEB-INF/src/cmdbuild/test'
A merge/WEB-INF/src/cmdbuild/test/TestEnum.java
A merge/WEB-INF/src/cmdbuild/test/TestCSV.java
A merge/WEB-INF/src/cmdbuild/test/TestAlfresco.java
A merge/WEB-INF/src/cmdbuild/test/TestAttachmentConfig.java
A merge/WEB-INF/src/cmdbuild/actions/AttachmentsAction.java
A merge/WEB-INF/src/cmdbuild/actions/AttachmentsDownloadAction.java
A merge/WEB-INF/src/cmdbuild/utils/AttachmentBeanComparator.java
A merge/WEB-INF/src/cmdbuild/action_forms/AttachmentsForm.java
Skipped missing target:
'merge/WEB-INF/src/cmdbuild/collection/OrderByBean.java'
A merge/WEB-INF/src/cmdbuild/collection/AttachmentConfigurator.java
A merge/WEB-INF/src/cmdbuild/collection/AttachmentBean.java
A merge/WEB-INF/src/cmdbuild/collection/AttachmentNode.java
A merge/WEB-INF/src/cmdbuild/presentation/AttachmentPageDelegator.java
Skipped 'merge/WEB-INF/src/cmdbuild/alfresco'
A merge/WEB-INF/src/cmdbuild/alfresco/AlfrescoFacade.java
Skipped 'merge/WEB-INF/src/cmdbuild/alfresco/fileserver'
A merge/WEB-INF/src/cmdbuild/alfresco/fileserver/AlfrescoFTP.java
A merge/WEB-INF/src/cmdbuild/alfresco/AlfrescoConstant.java
A merge/WEB-INF/src/cmdbuild/alfresco/AbstractAlfrescoFileServer.java
A merge/WEB-INF/src/cmdbuild/alfresco/AlfrescoCredential.java
A merge/WEB-INF/src/cmdbuild/alfresco/AlfrescoFilterBean.java
A merge/WEB-INF/src/cmdbuild/alfresco/CMDBAlfrescoMeta.java
A merge/WEB-INF/src/cmdbuild/alfresco/AlfrescoWebService.java
Skipped 'merge/WEB-INF/src/alfresco'
A merge/WEB-INF/src/alfresco/webserviceclient.properties
A merge/attachments.jsp

..so now i get the bugfix branch with the following changes:
  files that are only in the dev. branch are added,
  files that are only in the bugfix branch are deleted,
  no files are updates (as of the output), but the files in the merge are
the ones in the dev. branch..
..so, what i get is exactly the copy of the dev. branch :/

I'd really appreciate if someone can help!

2007/10/29, Mark Phippard <markphip@gmail.com>:
>
> On 10/29/07, Francesco Zanitti <f.zanitti@tecnoteca.it> wrote:
> > Hi everybody,
> > recently we have begun to use the subversion repository and now i'm
> facing
> > the following problem with subclipse plugin (got the same problem with
> > command line tool too):
> >
> > the repository is quite simple:
> >
> > /NewFeatureBranch--(rev.242)--
> > /
> > MainTrunk--------------(rev.252)-----------------------
> >
> >
> > that is, we have a main trunk where we resolve bugs and i've started a
> new
> > branch to develop a new feature of our product.
> >
> > Now i need to reflect the bug fix in the main trunk to the
> NewFeatureBranch
> > , so i've tried to do a merge with the main trunk (head revision for
> both,
> > tried also with "ignore ancestry").
> > The results are that the working copy now is exactly the same as the
> main
> > trunk. The new files i've done in the branch have gone and the files
> i've
> > updated have been "reverted" to the ones in the MainTrunk.
> > Clearly i'm missing something!
> >
> > I've tried also with the command line tools, issuing the following
> command:
> > svn checkout
> > svn://192.168.1.29/repository/MyProject/branches/NewFeatureBrach_at_HEAD
> > nfb
> > svn merge --ignore-ancestry
> > svn://192.168.1.29/repository/MyProject/branches/NewFeatureBrach_at_HEAD
> > svn://192.168.1.29/repository/MyProject/trunk/MainTrunk_at_HEAD
> > nfb
> >
> > with no luck (the names are not real for purpose, i try to make them
> > auto-explicative), the wirking copy nfb contains the same files as the
> > MainTrunk.
> >
> > The same thing happens if i try to make the inverse (porting the changes
> > from the NewFeatureBranch to the MainTrunk): the changes we've made to
> the
> > MainTrunk are lost and the older files stored in the NewFeatureBranch
> are
> > used instead (which is quite abnormal, svn should take care of revision,
> do
> > it?)
> >
> > I'm sure i'm missing something or doing something the wrong way, if
> somebody
> > can help will have my gratitude for ages!
>
> Think of merge as a fancy version of create patch + apply patch. In a
> lot of ways, that is what it is. Now, you make a bug fix in trunk at
> r252 and you want to merge that to the branch. When you run the merge
> command, the inputs are the values you need to create the patch, with
> the output being applied to your working copy. In your case, you
> would want a working copy checked out from your branch. The From and
> To URL would both be trunk (as that is where the change occurred. The
> From Revision would be 251 and the To Revision would be 252. In
> Subclipse you can just use the chooser button to select the range of
> revisions you want to merge and it will fill in the needed revision
> values.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: users-help@subclipse.tigris.org
>
>
Received on Wed Nov 7 10:56:58 2007

This is an archived mail posted to the Subclipse Users mailing list.