Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E2AF4D2B for ; Fri, 17 Jun 2011 15:35:28 +0000 (UTC) Received: (qmail 27856 invoked by uid 500); 17 Jun 2011 15:35:27 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 27834 invoked by uid 500); 17 Jun 2011 15:35:27 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 27827 invoked by uid 99); 17 Jun 2011 15:35:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2011 15:35:27 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of hapinerosa@gmail.com designates 209.85.215.171 as permitted sender) Received: from [209.85.215.171] (HELO mail-ey0-f171.google.com) (209.85.215.171) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2011 15:35:23 +0000 Received: by eydd26 with SMTP id d26so353299eyd.16 for ; Fri, 17 Jun 2011 08:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type; bh=bxdIwlbwLckVeJ9o9xzlX5PJNK7XQ7eKYJ5I7pGtvlc=; b=fCvErnbi1rfC8KzDkLayya/87E4inB4+JE/URvYR0FFx2M+uhTPvIZatoE+dalO6v1 elRLxJnXwW2uU024Xc2tFs/ri8Tr34Ms2awnHw0MDt6bANE48Zu68oq4f3IihSx3+2oC YIEbo8Ff/7MwfSqm/1vxpvTt7Kn0aLBBTKLyc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=Y6CouaezvPBtb9Rv72NS1+YSayM6EJqMx1sJ9LnbEAEYImvP5NrFcAu8ZyeRjlMDrk b50BHjaT+JEhe8n1v1OrjvpImRtBqoUkfIh3P9v6IjMe2JFfl36MpRhJgPHpQLWjOzk2 qsRxZIzbXer6xiUDrrBiWc2TdCsTeAJgk7Tc8= MIME-Version: 1.0 Received: by 10.213.31.197 with SMTP id z5mr963710ebc.83.1308324901105; Fri, 17 Jun 2011 08:35:01 -0700 (PDT) Received: by 10.213.114.3 with HTTP; Fri, 17 Jun 2011 08:35:01 -0700 (PDT) In-Reply-To: <20110617073225.GJ2145@ted.stsp.name> References: <20110616201032.GH2145@ted.stsp.name> <4DFA77AD.8080400@elegosoft.com> <20110617073225.GJ2145@ted.stsp.name> Date: Fri, 17 Jun 2011 10:35:01 -0500 Message-ID: Subject: Re: Issue with merge From: =?ISO-8859-1?Q?Henry_Pi=F1eros?= To: =?ISO-8859-1?Q?Henry_Pi=F1eros?= , Michael Diers , users@subversion.apache.org Content-Type: multipart/alternative; boundary=00151748e93afb318104a5ea201f --00151748e93afb318104a5ea201f Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Hi all. http://twitpic.com/5ctrar/full There are a picture of my issue!!! On Fri, Jun 17, 2011 at 2:32 AM, Stefan Sperling wrote: > On Thu, Jun 16, 2011 at 10:21:49PM -0500, Henry Pi=F1eros wrote: > > 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/* > > I think you should try to use this syntax instead: > > cd c:\trunk > svn merge --reintegrate > https://example-test-project.googlecode.com/svn/branches/branchPrueba/ > > > C Hola1.java > > > > =85 Shows a message to resolve conflict between fonts > > > > > > Tomorrow, I going to post here!! (with images) > > > > No, please do not post images to this list. > You may link to them if you have them somewhere on the web, but please > do not attach them. Mail you send to this list goes to a huge number > of mail boxes so please try to use only text to keep the messages small. > Thanks! > --=20 Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011 --00151748e93afb318104a5ea201f Content-Type: text/html; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Hi all.


There are a picture = of my issue!!!

On Fri, Jun 17, 2011 at 2:= 32 AM, Stefan Sperling <stsp@elego.de> wrote:
On Thu, Jun 16, 2011 at 1= 0:21:49PM -0500, Henry Pi=F1eros wrote:
> 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.co= m/svn/branches/branchPrueba/src/*

I think you should try to use this syntax instead:

=A0cd c:\trunk
=A0svn merge --reintegrate https://example-test-= project.googlecode.com/svn/branches/branchPrueba/

> C Hola1.java
>
> =85 Shows a message to resolve conflict between fonts
>
>
> Tomorrow, I going to post here!! (with images)
>

No, please do not post images to this list.
You may link to them if you have them somewhere on the web, but please
do not attach them. Mail you send to this list goes to a huge number
of mail boxes so please try to use only text to keep the messages small. Thanks!



--
Estudiante de Ingenieri= a de Sistemas e Informatica
=A0 =A0 =A0 =A0 =A0 =A0=A0 Univesidad Nacion= al de Colombia
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=A0 Sede M= edellin
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = 2011



--00151748e93afb318104a5ea201f--