From users-return-1314-daniel=haxx.se@subversion.apache.org Tue Mar 2 13:16:00 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o22CFxF9008418 for ; Tue, 2 Mar 2010 13:15:59 +0100 Received: (qmail 31426 invoked by uid 500); 2 Mar 2010 12:15:54 -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 31417 invoked by uid 99); 2 Mar 2010 12:15:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 12:15:54 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [213.86.135.44] (HELO ln1mx01.ldsam.com) (213.86.135.44) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 12:15:47 +0000 Received: from LN1EXC03.ad.linedata.com ([10.112.11.142]) by ln1exc03 ([10.112.11.142]) with mapi; Tue, 2 Mar 2010 12:15:23 +0000 From: Giulio Troccoli To: "'J. Bakshi'" CC: "users@subversion.apache.org" Content-Class: urn:content-classes:message Date: Tue, 2 Mar 2010 12:15:22 +0000 Subject: RE: strange problem with subversion merge Thread-Topic: strange problem with subversion merge Thread-Index: Acq5/0eeEbkepddeT9+MkPOQmWBzdgAAKteg Message-ID: <6680A70380E6BA44A2D94ED7085718EE19DE2D8E2A@ln1exc03> References: <4B8CF3AB.6020202@infoservices.in> <6680A70380E6BA44A2D94ED7085718EE19DE2D8E15@ln1exc03> <4B8CFCB6.9020802@infoservices.in> In-Reply-To: <4B8CFCB6.9020802@infoservices.in> Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 > Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851 VAT Reg No 778499447 -----Original Message----- > From: J. Bakshi [mailto:joydeep@infoservices.in] > Sent: 02 March 2010 11:56 > To: Giulio Troccoli > Cc: users@subversion.apache.org > Subject: Re: strange problem with subversion merge > > On 03/02/2010 05:02 PM, Giulio Troccoli wrote: > > > >> ```````````````` > >> svn merge -r 475:476 trunk/ > >> ````````````````` > >> just returns null value. It should merge the changes I made at > >> branches/mybranch/folder1/file1 to trunk/folder1/file1. > Have I missed > >> something ? Please suggest. > >> > >> > > > > I understand you want to merge the changes you have done in > the branch to the trunk. If that's the case then from the > branch you use the --reintegrate option. > > > > The merge command you issued merges the changes between 475 > and 476 done to trunk into the directory you are in. Since > the changes happened on the branch it's correct that it > doesn't merge anything. > > > > > > > Hello, > > Thanks a lot for your response. I am afraid but I am not > fully understand the logic. Which I am following is collected > from net and I have just doing the same. I admit I don't know > the in-depth about how merging works. It might be interesting > that I am now getting something new than the empty return as > before. Please fine below Ok, let's start on what you did before. You created a branch "mybranch" from trunk to work on something. This is co= rrect and the following is roughly what you should do in such cases - create the branch (done) - checkout the branch (done in branches/mybranch) - work on the branch committing as many times as you like - regularly merge the changes done in trunk cd branches/mybranch svn merge ^/trunk svn commit - when you're done with the branch and you want to merge it back to trunk cd branches/mybranch svn merge ^/trunk svn commit cd trunk svn merge --reintegrate ^/branches/mybranch This works because of merge-tracking. Unfortunately I think your version of= SVN server (1.5.1) has some problem with merge-tracking. Other members of = this ML hopefully will tell you for sure. I suggest you upgrade your server= anyway to the latest SVN which is 1.6.9. > `````````````````` > svn diff -r 488:489 > Index: branches/bug/typo3conf/localconf.php > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- branches/bug/typo3conf/localconf.php (revision 488) > +++ branches/bug/typo3conf/localconf.php (revision 489) > @@ -1,9 +1,12 @@ > > -qqwq > -wq > -wqq > -qw > +wew > +wew > +ew > +wew > + > `````````````````````` > > The modification is done at > branches/bug/typo3conf/localconf.php. Now I try to merge it to trunk > > ``````````````` > svn merge --dry-run -r 488:489 branches/bug/ trunk/ > > --- Merging r489 into 'trunk': > C trunk/typo3conf/localconf.php > Summary of conflicts: > Text conflicts: 1 > ```````````` That usually means that there are some changes done in trunk/typo3conf/loca= lconf.php that were not merged into branches/bug/type3conf/localconf.php. What does the log command on both files show? Giulio