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

Re: Issue with merge

From: Henry Piņeros <hapinerosa_at_gmail.com>
Date: Thu, 16 Jun 2011 15:36:41 -0500

Thanks Stefan!!.

Yes, I do svn revert -R or do a new checkout!!!

The problem is whenI try do a mergen on file level, but if I do it on folder
lever(parent folder of that file), It works!!!!

:(

On Thu, Jun 16, 2011 at 3:10 PM, Stefan Sperling <stsp_at_elego.de> wrote:

> On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piņeros wrote:
> > Hi all.
> >
> >
> > I do a merge between two folders (source) (Ep. svn merge
> > http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
> > with a conflcit -C)
> >
> > Whe and I try do it but directly in this file, the merges doesn't work
> (Ep.
> > svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't
> > show the conflict, it show -U File1.java!!
>
> Hmmm, your problem description is lacking a lot of detail :(
> I will try to help you anyway:
>
> Did you run "svn revert -R ." on your working copy before repeating
> the merge? If you did not, then merge tracking might prevent changes
> from being merged into the file because the file already has them.
> All you will end up with in this case is probably a mergeinfo change.
>
> If your working copy has no local changes (svn diff output is empty)
> and you don't get any changes merged into your working copy,
> try this command:
>
> svn diff http:xxx/src/File1.java http:xxx/src/File1.java
>
> and you will probably see that your merge has an *empty* diff.
> So there is nothing to merge, and no conflict.
> The only thing it changes is probably mergeinfo.
>
> You probably want something like this instead:
>
> cd src/
> svn merge -c 42 http:xxx/src/File1.java File1.java
>
> or this:
>
> cd src/
> svn merge http:xxx/src/File1.java_at_42 http:xxx/src/File1.java_at_43File1.java
>
> or this (to merge all outstanding changes):
>
> cd src/
> svn merge http:xxx/src/File1.java File1.java
>
> See also:
>
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax
>
> And this:
>
> http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3C20110308203505.GB19147@jack.stsp.name%3E
>

-- 
Estudiante de Ingenieria de Sistemas e Informatica
             Univesidad Nacional de Colombia
                         Sede Medellin
                                2011
Received on 2011-06-16 22:37:13 CEST

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