[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 22:21:49 -0500

This is my case!!!

1. I do a copyTo() from my trunk to a branch (branchPrueba).

2. I do a checkout from branchPrueba (C:/Prueba), I modify a file
(Hola1.java) and after I do commite it.

3. I do a checkout from trunk (C:/Trunk), I modify a file (Hola1.java) and
after I do commite it.

4. Run cmd, then… cd C:/Trunk/src

5. svn merge *https**://
example-test-project.googlecode.com/svn/trunk/src/Hola1.java* *https**://
example-test-project.googlecode.com/svn/branches/branchPrueba/src/Hola1.java
*

--Merge difference…

U Hola1.java

6. I drop C:/Trunk (I didn’t commit it).

7. Again, I do a checkout from trunk (C:/Trunk).

8. svn merge *https**://example-test-project.googlecode.com/svn/trunk/src/*
*https**://
example-test-project.googlecode.com/svn/branches/branchPrueba/src/*

C Hola1.java

… Shows a message to resolve conflict between fonts

Tomorrow, I going to post here!! (with images)

Thank before hands

... I forget this!! I do merge between the files .java with tortoise which
work very well.. It show the copnflict

2011/6/16 Michael Diers <mdiers_at_elegosoft.com>

> On 2011-06-16 22:37, Henry Piñeros wrote:
> > Can you try it in your computer ? A simple example!!! ( a flder with
> > two files)
> [...]
>
> Henry,
>
> please tell us _exactly_ what you did; that is, the sequence of
> Subversion commands, and their output, if any. Cut and paste from the
> command line window. Then indicate where and when Subversion didn't work
> as you expected, and why you think it is not working right.
>
> By doing that, you very much increase the chances of getting the answer
> you are looking for. Also, if people agree that there is a problem, you
> actually contributed a test case for the Subversion test suite!
>
> Thanks.
>
> --
> Michael Diers, elego Software Solutions GmbH, http://www.elego.de
>
>

-- 
Estudiante de Ingenieria de Sistemas e Informatica
             Univesidad Nacional de Colombia
                         Sede Medellin
                                2011
Received on 2011-06-17 05:22:26 CEST

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