From users-return-96-daniel=haxx.se@subversion.apache.org Fri Dec 18 22:40:00 2009 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 nBILdwZB016302 for ; Fri, 18 Dec 2009 22:39:59 +0100 Received: (qmail 8054 invoked by uid 500); 18 Dec 2009 21:39:53 -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 8046 invoked by uid 99); 18 Dec 2009 21:39:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 21:39:53 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [207.54.49.24] (HELO ussmtpp1.infor.com) (207.54.49.24) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 21:39:45 +0000 X-SBRS: None Received: from unknown (HELO usalwexcaht1.infor.com) ([10.38.32.5]) by smtp-relay.infor.com with ESMTP; 18 Dec 2009 16:39:23 -0500 Received: from USALWEXMB4.infor.com ([fe80::b4d3:3520:8e62:8774]) by usalwexcaht1 ([10.38.32.5]) with mapi; Fri, 18 Dec 2009 16:39:25 -0500 From: Bob Archer To: "Siefert, David" , "users@subversion.apache.org" Date: Fri, 18 Dec 2009 16:39:23 -0500 Subject: RE: merge does not allow --accept argument Thread-Topic: merge does not allow --accept argument Thread-Index: AcqAIukJzhOSqbgwShmePaBA7dSqswAAN8FQAABUTOAAAUurUA== Message-ID: References: <26D98389C14AF7468525E965C4636E540230F034BB@CHEXCHANGE.playboy.com> <26D98389C14AF7468525E965C4636E540230F034EF@CHEXCHANGE.playboy.com> In-Reply-To: <26D98389C14AF7468525E965C4636E540230F034EF@CHEXCHANGE.playboy.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org > > -----Original Message----- > > > I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is > > > /bin/bash). Trying to use merge and have it automatically > accept > > > my changes during conflicts by issuing: > > > svn merge --accept mine-full -c 12345 > > https://repository/branches/blah/blah/blah > > > > The above looks right. > > > > > also tried the following variants: > > > # based on svn help resolve (uses =3D in accept argument) > > > svn merge --accept=3Dmine-full -c 12345 > > > https://repository/branches/blah/blah/blah > > > > > > # trying with single quotes as listed in svn help merge > > > svn merge --accept=3D'mine-full' -c 12345 > > > https://repository/branches/blah/blah/blah > > > > > > # trying same as beginning, but with single quotes > > > svn merge --accept 'mine-full' -c 12345 > > > https://repository/branches/blah/blah/blah > > > with no luck. > > > > > > > Can you be more specific? What do you mean by "no luck". > > > > Are you getting an error on your command line. Is it not > accepting your > > files on conflicts? > Sorry--I meant to add the output from Subversion. I end up with > tree conflicts. The two files were added at different times with > different contents. I just want mine to basically overwrite the > others. Perhaps I need to add some sort of --ignore-ancestry > option? Ok, I'm gonna go out here on a limb (get it tree conflict, limb, anyway) an= d say that auto conflict resolution doesn't apply to a tree conflict. I thi= nk to resolve a tree conflict you have to manually make the tree in the mer= ge target match the merge source. I don't think svn can or will do that for= you automatically. BOb =20